merge in ics-release history after reset to master
diff --git a/V8_MERGE_REVISION b/V8_MERGE_REVISION
index 947c0f6..0c2bd3d 100644
--- a/V8_MERGE_REVISION
+++ b/V8_MERGE_REVISION
@@ -2,4 +2,4 @@
We have synced V8 past the last revision used in Chrome 12, as we continue to take 3.2 updates.
-http://v8.googlecode.com/svn/branches/3.2@8928
+http://v8.googlecode.com/svn/branches/3.2@8988
diff --git a/src/api.cc b/src/api.cc
index e1d6568..3ae6304 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -3779,7 +3779,7 @@
v8::Local<v8::Context> Context::GetEntered() {
i::Isolate* isolate = i::Isolate::Current();
- if (IsDeadCheck(isolate, "v8::Context::GetEntered()")) {
+ if (!EnsureInitializedForIsolate(isolate, "v8::Context::GetEntered()")) {
return Local<Context>();
}
i::Handle<i::Object> last =
diff --git a/src/version.cc b/src/version.cc
index 9c8de04..e42f77c 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 37
+#define PATCH_LEVEL 38
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
