Reviewers: Mads Ager, Description: Merge r6727 to 3.0 branch.
Please review this at http://codereview.chromium.org/6484001/ SVN Base: http://v8.googlecode.com/svn/branches/3.0/ Affected files: M src/ast.cc M src/version.cc Index: src/ast.cc =================================================================== --- src/ast.cc (revision 6727) +++ src/ast.cc (working copy) @@ -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())); Index: src/version.cc =================================================================== --- src/version.cc (revision 6727) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 0 #define BUILD_NUMBER 12 -#define PATCH_LEVEL 15 +#define PATCH_LEVEL 16 #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
