commit a497359afa1abe4c5780c8799c6fe0edab551c2d
author Ben Cheng <bccheng@android.com> Wed Mar 31 11:59:18 2010 -0700
committer Ben Cheng <bccheng@android.com> Wed Mar 31 12:17:29 2010 -0700
tree ec01e200a99247509f298221d03459324710bf0d
parent d4b078315ae7335c385f70b32810959bd228d976

Fix a race condition in JIT state refresh under debugging / misc code cleanup.

Bug: 2561283
Change-Id: I9fd94928f3e661de97098808340ea92b28cafa07

vm/compiler/codegen/arm/ArmLIR.h

diff --git a/vm/compiler/codegen/arm/ArmLIR.h b/vm/compiler/codegen/arm/ArmLIR.h
index e1073b6..f7704ad 100644
--- a/vm/compiler/codegen/arm/ArmLIR.h
+++ b/vm/compiler/codegen/arm/ArmLIR.h
@@ -318,18 +318,18 @@
     kArmPseudoBarrier = -17,
     kArmPseudoExtended = -16,
     kArmPseudoSSARep = -15,
-    ARM_PSEUDO_kEntryBlock = -14,
-    ARM_PSEUDO_kExitBlock = -13,
+    kArmPseudoEntryBlock = -14,
+    kArmPseudoExitBlock = -13,
     kArmPseudoTargetLabel = -12,
-    ARM_PSEUDO_kChainingCellBackwardBranch = -11,
-    ARM_PSEUDO_kChainingCellHot = -10,
-    ARM_PSEUDO_kChainingCellInvokePredicted = -9,
-    ARM_PSEUDO_kChainingCellInvokeSingleton = -8,
-    ARM_PSEUDO_kChainingCellNormal = -7,
-    ARM_PSEUDO_kDalvikByteCode_BOUNDARY = -6,
+    kArmPseudoChainingCellBackwardBranch = -11,
+    kArmPseudoChainingCellHot = -10,
+    kArmPseudoChainingCellInvokePredicted = -9,
+    kArmPseudoChainingCellInvokeSingleton = -8,
+    kArmPseudoChainingCellNormal = -7,
+    kArmPseudoDalvikByteCodeBoundary = -6,
     kArmPseudoPseudoAlign4 = -5,
-    ARM_PSEUDO_kPCReconstruction_CELL = -4,
-    ARM_PSEUDO_kPCReconstruction_BLOCK_LABEL = -3,
+    kArmPseudoPCReconstructionCell = -4,
+    kArmPseudoPCReconstructionBlockLabel = -3,
     kArmPseudoEHBlockLabel = -2,
     kArmPseudoNormalBlockLabel = -1,
     /************************************************************************/