| Index: src/arm/assembler-arm.cc
|
| diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
|
| index 0c9165a303b8ffb7290831a7f4375b6fac0a265c..e94e17a7c87140f5092f661b7f4674157b7c4e32 100644
|
| --- a/src/arm/assembler-arm.cc
|
| +++ b/src/arm/assembler-arm.cc
|
| @@ -2164,7 +2164,11 @@ void Assembler::stop(const char* msg, Condition cond, int32_t code) {
|
| } else {
|
| svc(kStopCode + kMaxStopCode, cond);
|
| }
|
| - emit(reinterpret_cast<Instr>(msg));
|
| + // Do not embed the message string address! We used to do this, but that
|
| + // made snapshots created from position-independent executable builds
|
| + // non-deterministic.
|
| + // TODO(yangguo): remove this field entirely.
|
| + nop();
|
| }
|
| #else // def __arm__
|
| if (cond != al) {
|
|
|