Revision: 4982 Author: [email protected] Date: Tue Jun 29 17:11:22 2010 Log: [Isolates] Fixing Win32 compile and running tests failure.
Landing patch by Maxim.Mossienko with minor changes in candidate version handling. Original review: http://codereview.chromium.org/2844034/show Review URL: http://codereview.chromium.org/2878014 http://code.google.com/p/v8/source/detail?r=4982 Modified: /branches/experimental/isolates/src/ast.cc /branches/experimental/isolates/src/builtins.cc /branches/experimental/isolates/src/isolate.cc /branches/experimental/isolates/src/isolate.h /branches/experimental/isolates/src/v8.cc /branches/experimental/isolates/src/version.cc ======================================= --- /branches/experimental/isolates/src/ast.cc Fri Jun 25 15:32:52 2010 +++ /branches/experimental/isolates/src/ast.cc Tue Jun 29 17:11:22 2010 @@ -89,7 +89,8 @@ VariableProxy::VariableProxy(bool is_this) - : is_this_(is_this), + : var_(NULL), + is_this_(is_this), reaching_definitions_(NULL), is_primitive_(false) { } ======================================= --- /branches/experimental/isolates/src/builtins.cc Fri Jun 25 15:53:25 2010 +++ /branches/experimental/isolates/src/builtins.cc Tue Jun 29 17:11:22 2010 @@ -1379,7 +1379,7 @@ #endif -Builtins::Builtins() { +Builtins::Builtins() : initialized_(false) { memset(builtins_, 0, sizeof(builtins_[0]) * builtin_count); memset(names_, 0, sizeof(names_[0]) * builtin_count); } ======================================= --- /branches/experimental/isolates/src/isolate.cc Tue Jun 29 13:01:19 2010 +++ /branches/experimental/isolates/src/isolate.cc Tue Jun 29 17:11:22 2010 @@ -285,12 +285,15 @@ #undef ISOLATE_INIT_ARRAY_EXECUTE } - -void Isolate::TearDownAndRecreateGlobalIsolate() { +void Isolate::TearDown() { if (global_isolate_ != NULL) { delete global_isolate_; global_isolate_ = NULL; } +} + +void Isolate::TearDownAndRecreateGlobalIsolate() { + TearDown(); global_isolate_ = new Isolate(); global_isolate_->PreInit(); ======================================= --- /branches/experimental/isolates/src/isolate.h Tue Jun 29 13:01:19 2010 +++ /branches/experimental/isolates/src/isolate.h Tue Jun 29 17:11:22 2010 @@ -277,6 +277,9 @@ static Isolate* InitThreadForGlobalIsolate(); #endif + // Destroy the global isolate. + static void TearDown(); + // Destroy the global isolate and create a new one in its place. static void TearDownAndRecreateGlobalIsolate(); ======================================= --- /branches/experimental/isolates/src/v8.cc Mon Jun 21 10:40:11 2010 +++ /branches/experimental/isolates/src/v8.cc Tue Jun 29 17:11:22 2010 @@ -67,7 +67,7 @@ void V8::TearDown() { if (!has_been_setup_ || has_been_disposed_) return; - Isolate::TearDownAndRecreateGlobalIsolate(); + Isolate::TearDown(); is_running_ = false; has_been_disposed_ = true; ======================================= --- /branches/experimental/isolates/src/version.cc Fri Jun 25 15:53:25 2010 +++ /branches/experimental/isolates/src/version.cc Tue Jun 29 17:11:22 2010 @@ -36,14 +36,16 @@ #define MINOR_VERSION 2 #define BUILD_NUMBER 20 #define PATCH_LEVEL 0 -#define CANDIDATE_VERSION true +// Use 1 for candidates and 0 otherwise. +// (Boolean macro values are not supported by all preprocessors.) +#define IS_CANDIDATE_VERSION 0 // Define SONAME to have the SCons build the put a specific SONAME into the // shared library instead the generic SONAME generated from the V8 version // number. This define is mainly used by the SCons build script. #define SONAME "" -#if CANDIDATE_VERSION == true +#if IS_CANDIDATE_VERSION #define CANDIDATE_STRING " (candidate)" #else #define CANDIDATE_STRING "" @@ -69,7 +71,7 @@ int Version::minor_ = MINOR_VERSION; int Version::build_ = BUILD_NUMBER; int Version::patch_ = PATCH_LEVEL; -bool Version::candidate_ = CANDIDATE_VERSION; +bool Version::candidate_ = (IS_CANDIDATE_VERSION != 0); const char* Version::soname_ = SONAME; const char* Version::version_string_ = VERSION_STRING; -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
