Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index ef4f0c5f2b662e0f7a5a86a1213043202b01db13..28b766ae60423df79034563d99634bf272779a7e 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -615,6 +615,11 @@ MemOperand FullCodeGenerator::StackOperand(Variable* var) { |
offset += (info_->scope()->num_parameters() + 1) * kPointerSize; |
} else { |
offset += JavaScriptFrameConstants::kLocal0Offset; |
+ // Test if the variable is from a nested block scope. |
+ if (info_->scope() != var->scope()) { |
+ // Skip handlers and stack locals from enclosing block scopes. |
+ offset -= var->scope()->stack_slots_depth() * kPointerSize; |
+ } |
} |
return Operand(ebp, offset); |
} |