Author: [email protected]
Date: Wed Jul 15 05:12:41 2009
New Revision: 2476
Added:
branches/1.2/test/mjsunit/regress/regress-345.js
- copied unchanged from r2466,
/branches/bleeding_edge/test/mjsunit/regress/regress-345.js
Modified:
branches/1.2/src/parser.cc
branches/1.2/src/version.cc
Log:
Merge r2466 to branches/1.2.
Review URL: http://codereview.chromium.org/155565
Modified: branches/1.2/src/parser.cc
==============================================================================
--- branches/1.2/src/parser.cc (original)
+++ branches/1.2/src/parser.cc Wed Jul 15 05:12:41 2009
@@ -2367,7 +2367,7 @@
result = NEW(TryFinally(try_block, finally_block));
// Add the jump targets of the try block and the catch block.
for (int i = 0; i < collector.targets()->length(); i++) {
- catch_collector.targets()->Add(collector.targets()->at(i));
+ catch_collector.AddTarget(collector.targets()->at(i));
}
result->set_escaping_targets(catch_collector.targets());
}
Modified: branches/1.2/src/version.cc
==============================================================================
--- branches/1.2/src/version.cc (original)
+++ branches/1.2/src/version.cc Wed Jul 15 05:12:41 2009
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 1
#define MINOR_VERSION 2
#define BUILD_NUMBER 14
-#define PATCH_LEVEL 1
+#define PATCH_LEVEL 2
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
