Push version 2.4.9 to trunk.
Fixed a bug in the handling of conditional expressions in test contexts in compiler for top-level code.
Added "//@ sourceURL" information to the StackTrace API.
Exposed RegExp construction through the API.
git-svn-id: http://v8.googlecode.com/svn/trunk@5610 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index d273e75..684106c 100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -175,7 +175,7 @@
// Adjust for function-level loop nesting.
ASSERT_EQ(0, loop_nesting_);
- loop_nesting_ = info->loop_nesting();
+ loop_nesting_ = info->is_in_loop() ? 1 : 0;
{
CodeGenState state(this);
@@ -339,7 +339,7 @@
}
// Adjust for function-level loop nesting.
- ASSERT(loop_nesting_ == info->loop_nesting());
+ ASSERT(loop_nesting_ == info->is_in_loop()? 1 : 0);
loop_nesting_ = 0;
// Code generation state must be reset.
@@ -3132,9 +3132,9 @@
// Build the function info and instantiate it.
Handle<SharedFunctionInfo> function_info =
- Compiler::BuildFunctionInfo(node, script(), this);
- // Check for stack-overflow exception.
- if (HasStackOverflow()) {
+ Compiler::BuildFunctionInfo(node, script());
+ if (function_info.is_null()) {
+ SetStackOverflow();
ASSERT(frame_->height() == original_height);
return;
}