diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-17 13:05:20 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-17 13:05:20 +0200 |
| commit | a177f55b0c022b5a77e9660beea5e190bc4c6e88 (patch) | |
| tree | 969156e456a55ad3470a64fb3bca1806c8020463 /deps/v8 | |
| parent | 90ea68107a94b33e6b20cd9c2af8547b8c41da7c (diff) | |
| parent | 9918e5d4f6fbc8fe63d0395170a2daef2484d17a (diff) | |
| download | node-a177f55b0c022b5a77e9660beea5e190bc4c6e88.tar.gz | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
ChangeLog
src/node_version.h
test/message/stdin_messages.out
tools/install.py
Diffstat (limited to 'deps/v8')
| -rw-r--r-- | deps/v8/src/hydrogen-instructions.cc | 7 | ||||
| -rw-r--r-- | deps/v8/src/version.cc | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/deps/v8/src/hydrogen-instructions.cc b/deps/v8/src/hydrogen-instructions.cc index 4bb25096f..db3c3f3f7 100644 --- a/deps/v8/src/hydrogen-instructions.cc +++ b/deps/v8/src/hydrogen-instructions.cc @@ -1631,6 +1631,7 @@ static bool PrototypeChainCanNeverResolve( if (current->IsJSGlobalProxy() || current->IsGlobalObject() || !current->IsJSObject() || + JSObject::cast(current)->map()->has_named_interceptor() || JSObject::cast(current)->IsAccessCheckNeeded() || !JSObject::cast(current)->HasFastProperties()) { return false; @@ -1685,7 +1686,8 @@ HLoadNamedFieldPolymorphic::HLoadNamedFieldPolymorphic(HValue* context, types_.Add(types->at(i), zone); break; case MAP_TRANSITION: - if (PrototypeChainCanNeverResolve(map, name)) { + if (!map->has_named_interceptor() && + PrototypeChainCanNeverResolve(map, name)) { negative_lookups.Add(types->at(i), zone); } break; @@ -1693,7 +1695,8 @@ HLoadNamedFieldPolymorphic::HLoadNamedFieldPolymorphic(HValue* context, break; } } else if (lookup.IsCacheable()) { - if (PrototypeChainCanNeverResolve(map, name)) { + if (!map->has_named_interceptor() && + PrototypeChainCanNeverResolve(map, name)) { negative_lookups.Add(types->at(i), zone); } } diff --git a/deps/v8/src/version.cc b/deps/v8/src/version.cc index 75abe5714..f6afc47cc 100644 --- a/deps/v8/src/version.cc +++ b/deps/v8/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 11 #define BUILD_NUMBER 10 -#define PATCH_LEVEL 17 +#define PATCH_LEVEL 18 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 |