Index: src/arm/assembler-arm.cc |
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc |
index c88f1f4840e485f3dc1a10d158f6a8265052b0f8..1756b965ed3686c42888dd3eb79f7906a05a93e9 100644 |
--- a/src/arm/assembler-arm.cc |
+++ b/src/arm/assembler-arm.cc |
@@ -2282,19 +2282,12 @@ void Assembler::stop(const char* msg, Condition cond, int32_t code) { |
#ifndef __arm__ |
DCHECK(code >= kDefaultStopCode); |
{ |
- // The Simulator will handle the stop instruction and get the message |
- // address. It expects to find the address just after the svc instruction. |
BlockConstPoolScope block_const_pool(this); |
if (code >= 0) { |
svc(kStopCode + code, cond); |
} else { |
svc(kStopCode + kMaxStopCode, cond); |
} |
- // 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) { |