Revision: 6740 Author: [email protected] Date: Fri Feb 11 01:37:16 2011 Log: Merge r6727 to 3.0 branch.
Review URL: http://codereview.chromium.org/6484001 http://code.google.com/p/v8/source/detail?r=6740 Modified: /branches/3.0/src/ast.cc /branches/3.0/src/version.cc ======================================= --- /branches/3.0/src/ast.cc Fri Jan 28 00:04:38 2011 +++ /branches/3.0/src/ast.cc Fri Feb 11 01:37:16 2011 @@ -611,7 +611,9 @@ cell_ = Handle<JSGlobalPropertyCell>::null(); LookupResult lookup; global->Lookup(*name, &lookup); - if (lookup.IsProperty() && lookup.type() == NORMAL) { + if (lookup.IsProperty() && + lookup.type() == NORMAL && + lookup.holder() == *global) { cell_ = Handle<JSGlobalPropertyCell>(global->GetPropertyCell(&lookup)); if (cell_->value()->IsJSFunction()) { Handle<JSFunction> candidate(JSFunction::cast(cell_->value())); ======================================= --- /branches/3.0/src/version.cc Fri Feb 11 01:02:40 2011 +++ /branches/3.0/src/version.cc Fri Feb 11 01:37:16 2011 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 0 #define BUILD_NUMBER 12 -#define PATCH_LEVEL 16 +#define PATCH_LEVEL 17 #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
