Skip to content

Commit

Permalink
Merge pull request #6631 from jamesgua/duplicate_opcode
Browse files Browse the repository at this point in the history
Remove duplicate _opcode at arm and x level
  • Loading branch information
knn-k committed Aug 4, 2022
2 parents 22abc0b + 3df5f69 commit e02a9ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions compiler/arm/codegen/OMRInstruction.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2021 IBM Corp. and others
* Copyright (c) 2000, 2022 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -210,7 +210,6 @@ class OMR_EXTENSIBLE Instruction : public OMR::Instruction


private:
TR::InstOpCode _opcode;
TR_ARMConditionCode _conditionCode;
TR::RegisterDependencyConditions *_conditions;
bool _asyncBranch;
Expand Down
1 change: 0 additions & 1 deletion compiler/x/codegen/OMRInstruction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ class OMR_EXTENSIBLE Instruction : public OMR::Instruction

private:

TR::InstOpCode _opcode;
TR::RegisterDependencyConditions *_conditions;
void assumeValidInstruction();

Expand Down

0 comments on commit e02a9ea

Please sign in to comment.