diff options
| author | Bill Buzbee <buzbee@google.com> | 2011-04-04 12:10:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-04 12:10:09 -0700 |
| commit | 1d41040ad8175f89f1c19a4dfbaf6ae47baf7947 (patch) | |
| tree | 976709957a2d6b9be479a552d49b945985507af1 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | c26cd1ae75aa947b452ebe208b1ceaa06f292378 (diff) | |
| parent | 49f30642f0b808e29e06576278482bf4adfb5f77 (diff) | |
Merge "Do not emit the write barrier when storing to primitive volatile fields."
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index f020e9c63..465eade83 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -2575,6 +2575,10 @@ static bool handleFmt22c_Fmt52c(CompilationUnit *cUnit, MIR *mir) case OP_IPUT_WIDE_JUMBO: genIPutWide(cUnit, mir, fieldOffset); break; + case OP_IPUT_VOLATILE: + case OP_IPUT_VOLATILE_JUMBO: + isVolatile = true; + // NOTE: intentional fallthrough case OP_IPUT: case OP_IPUT_JUMBO: case OP_IPUT_BOOLEAN: @@ -2587,8 +2591,6 @@ static bool handleFmt22c_Fmt52c(CompilationUnit *cUnit, MIR *mir) case OP_IPUT_SHORT_JUMBO: genIPut(cUnit, mir, kWord, fieldOffset, false, isVolatile); break; - case OP_IPUT_VOLATILE: - case OP_IPUT_VOLATILE_JUMBO: case OP_IPUT_OBJECT_VOLATILE: case OP_IPUT_OBJECT_VOLATILE_JUMBO: isVolatile = true; |