Chromium Code Reviews| Index: src/hydrogen.cc |
| diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
| index 6bd1a6b0e05bfb77c838507703d9bb08fec01f7f..91cb7dd07d0577907b5d212b186acde611dd7dd3 100644 |
| --- a/src/hydrogen.cc |
| +++ b/src/hydrogen.cc |
| @@ -2235,6 +2235,7 @@ void HGraphBuilder::SetupScope(Scope* scope) { |
| // not have declarations). |
| if (scope->arguments() != NULL) { |
| if (!scope->arguments()->IsStackAllocated() || |
| + scope->arguments_shadow() != NULL && |
|
Kevin Millikin (Chromium)
2011/03/07 11:46:48
Parens around the && please.
Martin Maly
2011/03/07 19:09:40
Done.
|
| !scope->arguments_shadow()->IsStackAllocated()) { |
| BAILOUT("context-allocated arguments"); |
| } |
| @@ -2242,7 +2243,9 @@ void HGraphBuilder::SetupScope(Scope* scope) { |
| 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); |
| + } |
| } |
| } |