Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index 6bd1a6b0e05bfb77c838507703d9bb08fec01f7f..8aeac396a116667068406a1e7fbe2483bfc7c4a2 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -2235,14 +2235,17 @@ void HGraphBuilder::SetupScope(Scope* scope) { |
// not have declarations). |
if (scope->arguments() != NULL) { |
if (!scope->arguments()->IsStackAllocated() || |
- !scope->arguments_shadow()->IsStackAllocated()) { |
+ (scope->arguments_shadow() != NULL && |
+ !scope->arguments_shadow()->IsStackAllocated())) { |
BAILOUT("context-allocated arguments"); |
} |
HArgumentsObject* object = new HArgumentsObject; |
AddInstruction(object); |
graph()->SetArgumentsObject(object); |
environment()->Bind(scope->arguments(), object); |
- environment()->Bind(scope->arguments_shadow(), object); |
+ if (scope->arguments_shadow() != NULL) { |
+ environment()->Bind(scope->arguments_shadow(), object); |
+ } |
} |
} |