Index: src/arm/full-codegen-arm.cc |
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc |
index 0275730aed73a82c00e73a9cfe0b2310e64ac8c3..338e39cbe823ddbe4f32556268284ca01c770727 100644 |
--- a/src/arm/full-codegen-arm.cc |
+++ b/src/arm/full-codegen-arm.cc |
@@ -1,4 +1,4 @@ |
-// Copyright 2010 the V8 project authors. All rights reserved. |
+// Copyright 2011 the V8 project authors. All rights reserved. |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
@@ -221,10 +221,17 @@ void FullCodeGenerator::EmitStackCheck(IterationStatement* stmt) { |
__ b(hs, &ok); |
StackCheckStub stub; |
__ CallStub(&stub); |
+ // Record a mapping of this PC offset to the OSR id. This is used to find |
+ // the AST id from the unoptimized code in order to use it as a key into |
+ // the deoptimization input data found in the optimized code. |
+ RecordStackCheck(stmt->OsrEntryId()); |
+ |
__ bind(&ok); |
PrepareForBailoutForId(stmt->EntryId(), NO_REGISTERS); |
+ // Record a mapping of the OSR id to this PC. This is used if the OSR |
+ // entry becomes the target of a bailout. We don't expect it to be, but |
+ // we want it to work if it is. |
PrepareForBailoutForId(stmt->OsrEntryId(), NO_REGISTERS); |
- RecordStackCheck(stmt->OsrEntryId()); |
} |