diff options
| author | 2012-03-30 11:07:52 -0700 | |
|---|---|---|
| committer | 2012-03-30 11:07:52 -0700 | |
| commit | c92653641c1334bc50e52d0f1a04201651ad312e (patch) | |
| tree | fbd60d13cad4a31023a906b10f11553c06ac3813 /src/compiler/codegen/MethodCodegenDriver.cc | |
| parent | c6c317e1ce8167b1e5a6aa293545ce6baaafa4b9 (diff) | |
| parent | a2e39d9c54a1e35e3f67ee3543bf7039f112d39c (diff) | |
Merge "Enable the rest of branch fusing" into ics-mr1-plus-art
Diffstat (limited to 'src/compiler/codegen/MethodCodegenDriver.cc')
| -rw-r--r-- | src/compiler/codegen/MethodCodegenDriver.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc index 1dc11dac70..fb9bdc9227 100644 --- a/src/compiler/codegen/MethodCodegenDriver.cc +++ b/src/compiler/codegen/MethodCodegenDriver.cc @@ -737,9 +737,6 @@ bool compileDalvikInstruction(CompilationUnit* cUnit, MIR* mir, const char* extendedMIROpNames[kMirOpLast - kMirOpFirst] = { "kMirOpPhi", - "kMirOpNullNRangeUpCheck", - "kMirOpNullNRangeDownCheck", - "kMirOpLowerBound", "kMirOpCopy", "kMirFusedCmplFloat", "kMirFusedCmpgFloat", @@ -747,6 +744,9 @@ const char* extendedMIROpNames[kMirOpLast - kMirOpFirst] = { "kMirFusedCmpgDouble", "kMirFusedCmpLong", "kMirNop", + "kMirOpNullNRangeUpCheck", + "kMirOpNullNRangeDownCheck", + "kMirOpLowerBound", }; /* Extended MIR instructions like PHI */ |