Index: src/runtime/runtime-scopes.cc |
diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc |
index 603189c4f055d76ed0a7ddbafa5c9aaa8e29abaa..c64aac5bb7fb4508477e614be0d709503d2d2588 100644 |
--- a/src/runtime/runtime-scopes.cc |
+++ b/src/runtime/runtime-scopes.cc |
@@ -377,6 +377,8 @@ std::unique_ptr<Handle<Object>[]> GetCallerArguments(Isolate* isolate, |
NewArray<Handle<Object>>(*total_argc)); |
bool should_deoptimize = false; |
for (int i = 0; i < argument_count; i++) { |
+ // If we materialize any object, we should deoptimize the frame because we |
+ // might alias an object that was eliminated by escape analysis. |
should_deoptimize = should_deoptimize || iter->IsMaterializedObject(); |
Handle<Object> value = iter->GetValue(); |
param_data[i] = value; |
@@ -384,7 +386,7 @@ std::unique_ptr<Handle<Object>[]> GetCallerArguments(Isolate* isolate, |
} |
if (should_deoptimize) { |
- translated_values.StoreMaterializedValuesAndDeopt(); |
+ translated_values.StoreMaterializedValuesAndDeopt(frame); |
} |
return param_data; |