Revision: 7458
Author: [email protected]
Date: Thu Mar 31 05:17:55 2011
Log: Merge r7454 from bleeding edge.
Review URL: http://codereview.chromium.org/6728022
http://code.google.com/p/v8/source/detail?r=7458
Modified:
/branches/3.1/src/heap.h
/branches/3.1/src/ic.cc
/branches/3.1/src/version.cc
=======================================
--- /branches/3.1/src/heap.h Thu Feb 24 02:10:44 2011
+++ /branches/3.1/src/heap.h Thu Mar 31 05:17:55 2011
@@ -163,6 +163,7 @@
V(name_symbol, "name") \
V(number_symbol, "number") \
V(Number_symbol, "Number") \
+ V(nan_symbol, "NaN") \
V(RegExp_symbol, "RegExp") \
V(source_symbol, "source") \
V(global_symbol, "global") \
=======================================
--- /branches/3.1/src/ic.cc Wed Mar 2 05:43:26 2011
+++ /branches/3.1/src/ic.cc Thu Mar 31 05:17:55 2011
@@ -1113,6 +1113,16 @@
MaybeObject* KeyedLoadIC::Load(State state,
Handle<Object> object,
Handle<Object> key) {
+ // Check for values that can be converted into a symbol.
+ // TODO(1295): Remove this code.
+ HandleScope scope;
+ if (key->IsHeapNumber() &&
+ isnan(HeapNumber::cast(*key)->value())) {
+ key = Factory::nan_symbol();
+ } else if (key->IsUndefined()) {
+ key = Factory::undefined_symbol();
+ }
+
if (key->IsSymbol()) {
Handle<String> name = Handle<String>::cast(key);
=======================================
--- /branches/3.1/src/version.cc Wed Mar 30 00:19:24 2011
+++ /branches/3.1/src/version.cc Thu Mar 31 05:17:55 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 1
#define BUILD_NUMBER 8
-#define PATCH_LEVEL 6
+#define PATCH_LEVEL 7
#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
