diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org> | 2014-09-25 11:36:44 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org> | 2014-09-25 11:36:44 +0000 |
| commit | 5830436a84f7792f61451af9bccd991d923fe81c (patch) | |
| tree | 06a0ffb44e01f06a1cc54ea24bd539265dee2ac8 | |
| parent | b4ef18e93b120b995e067ba72707b62a448eeed6 (diff) | |
| download | v8-5830436a84f7792f61451af9bccd991d923fe81c.tar.gz | |
Version 3.29.88.1 (merged r24221)
Revert part of r24098
BUG=chromium:417508
LOG=N
R=machenbach@chromium.org
Review URL: https://codereview.chromium.org/604743004
git-svn-id: https://v8.googlecode.com/svn/trunk@24223 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
| -rw-r--r-- | src/ic/ic.cc | 12 | ||||
| -rw-r--r-- | src/version.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ic/ic.cc b/src/ic/ic.cc index 63c37992e..1f3c75099 100644 --- a/src/ic/ic.cc +++ b/src/ic/ic.cc @@ -1807,12 +1807,12 @@ MaybeHandle<Object> KeyedStoreIC::Store(Handle<Object> object, StoreIC::Store(object, Handle<String>::cast(key), value, JSReceiver::MAY_BE_STORE_FROM_KEYED), Object); - if (!is_target_set()) { - TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", - "unhandled internalized string key"); - TRACE_IC("StoreIC", key); - set_target(*stub); - } + // TODO(jkummerow): Ideally we'd wrap this in "if (!is_target_set())", + // but doing so causes Hydrogen crashes. Needs investigation. + TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", + "unhandled internalized string key"); + TRACE_IC("StoreIC", key); + set_target(*stub); return store_handle; } diff --git a/src/version.cc b/src/version.cc index e7e931b9d..d95007d04 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 29 #define BUILD_NUMBER 88 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 |