commit e84278b035c8a48f6032ef98fae008d875fba7a4
author Elliott Hughes <enh@google.com> Thu Mar 22 10:06:53 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Mar 22 10:06:53 2012 -0700
tree 899db76267f361ead832a9a59160848961849df8
parent 3a71160a8ca468bbf80c57e49c3450a7807c4c52

Stop saying "clazz".

Change-Id: I569a3d29f6a394ee40e6dbdb8f76ae9a60348b65

src/compiler/codegen/GenCommon.cc

diff --git a/src/compiler/codegen/GenCommon.cc b/src/compiler/codegen/GenCommon.cc
index b45fbaa6..3ca0450 100644
--- a/src/compiler/codegen/GenCommon.cc
+++ b/src/compiler/codegen/GenCommon.cc
@@ -1258,10 +1258,10 @@
     }
     /* rARG0 is ref, rARG2 is class. If ref==null, use directly as bool result */
     LIR* branch1 = opCmpImmBranch(cUnit, kCondEq, rARG0, 0, NULL);
-    /* load object->clazz */
+    /* load object->klass_ */
     DCHECK_EQ(Object::ClassOffset().Int32Value(), 0);
     loadWordDisp(cUnit, rARG0,  Object::ClassOffset().Int32Value(), rARG1);
-    /* rARG0 is ref, rARG1 is ref->clazz, rARG2 is class */
+    /* rARG0 is ref, rARG1 is ref->klass_, rARG2 is class */
 #if defined(TARGET_ARM)
     /* Uses conditional nullification */
     int rTgt = loadHelper(cUnit, OFFSETOF_MEMBER(Thread,
@@ -1348,10 +1348,10 @@
     loadValueDirectFixed(cUnit, rlSrc, rARG0);  // rARG0 <= ref
     /* Null is OK - continue */
     LIR* branch1 = opCmpImmBranch(cUnit, kCondEq, rARG0, 0, NULL);
-    /* load object->clazz */
+    /* load object->klass_ */
     DCHECK_EQ(Object::ClassOffset().Int32Value(), 0);
     loadWordDisp(cUnit, rARG0,  Object::ClassOffset().Int32Value(), rARG1);
-    /* rARG1 now contains object->clazz */
+    /* rARG1 now contains object->klass_ */
 #if defined(TARGET_MIPS) || defined(TARGET_X86)
     LIR* branch2 = opCmpBranch(cUnit, kCondEq, rARG1, classReg, NULL);
     callRuntimeHelperRegReg(cUnit, OFFSETOF_MEMBER(Thread,
@@ -1392,7 +1392,7 @@
 
     /* null array object? */
     genNullCheck(cUnit, rlArray.sRegLow, rARG1, mir);
-    /* Get the array's clazz */
+    /* Get the array's class */
     loadWordDisp(cUnit, rARG1, Object::ClassOffset().Int32Value(), rARG1);
     callRuntimeHelperRegReg(cUnit, OFFSETOF_MEMBER(Thread,
                                                   pCanPutArrayElementFromCode),