Chromium Code Reviews| Index: src/arm/code-stubs-arm.cc | 
| =================================================================== | 
| --- src/arm/code-stubs-arm.cc (revision 8912) | 
| +++ src/arm/code-stubs-arm.cc (working copy) | 
| @@ -6319,7 +6319,9 @@ | 
| RelocInfo::CODE_TARGET)); | 
| __ mov(r2, Operand(function)); | 
| // Push return address (accessible to GC through exit frame pc). | 
| - __ str(pc, MemOperand(sp, 0)); | 
| + // Note that using pc with str is deprecated. | 
| + __ add(ip, pc, Operand(4)); | 
| 
 
m.m.capewell
2011/08/12 11:50:54
Replace 4 with kInstrSize, and assert on the size
 
 | 
| + __ str(ip, MemOperand(sp, 0)); | 
| __ Jump(r2); // Call the api function. | 
| } | 
| @@ -6329,7 +6331,9 @@ | 
| __ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()), | 
| RelocInfo::CODE_TARGET)); | 
| // Push return address (accessible to GC through exit frame pc). | 
| - __ str(pc, MemOperand(sp, 0)); | 
| + // Note that using pc with str is deprecated. | 
| + __ add(ip, pc, Operand(4)); | 
| 
 
m.m.capewell
2011/08/12 11:50:54
As above.
 
 | 
| + __ str(ip, MemOperand(sp, 0)); | 
| __ Jump(target); // Call the C++ function. | 
| } |