Revert "*NumberDictionary::AtNumberPut() handlified."

This reverts commit r20932 for breaking Mac build.

TBR=yangguo@chromium.org

Review URL: https://codereview.chromium.org/251383003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20933 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index b9722d18719d3d0884dcbaac5ba56f135527a894..0c9f3af41f325114e9bd23d22b18b17e61a4a7ee 100644 (file)
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -135,6 +135,7 @@ void CodeStub::VerifyPlatformFeatures(Isolate* isolate) {
 
 
 Handle<Code> CodeStub::GetCode(Isolate* isolate) {
+  Factory* factory = isolate->factory();
   Heap* heap = isolate->heap();
   Code* code;
   if (UseSpecialCache()
@@ -169,7 +170,7 @@ Handle<Code> CodeStub::GetCode(Isolate* isolate) {
     } else {
       // Update the dictionary and the root in Heap.
       Handle<UnseededNumberDictionary> dict =
-          UnseededNumberDictionary::AtNumberPut(
+          factory->DictionaryAtNumberPut(
               Handle<UnseededNumberDictionary>(heap->code_stubs()),
               GetKey(),
               new_object);

diff --git a/src/factory.cc b/src/factory.cc
index 36d7332e53a2d191d053d5c9a2a5d9f32335934e..2e405bc27e8b73e37685f76419253bd8c1991745 100644 (file)
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -1963,6 +1963,26 @@ Handle<String> Factory::NumberToString(Handle<Object> number,
 }
 
 
+Handle<SeededNumberDictionary> Factory::DictionaryAtNumberPut(
+    Handle<SeededNumberDictionary> dictionary,
+    uint32_t key,
+    Handle<Object> value) {
+  CALL_HEAP_FUNCTION(isolate(),
+                     dictionary->AtNumberPut(key, *value),
+                     SeededNumberDictionary);
+}
+
+
+Handle<UnseededNumberDictionary> Factory::DictionaryAtNumberPut(
+    Handle<UnseededNumberDictionary> dictionary,
+    uint32_t key,
+    Handle<Object> value) {
+  CALL_HEAP_FUNCTION(isolate(),
+                     dictionary->AtNumberPut(key, *value),
+                     UnseededNumberDictionary);
+}
+
+
 void Factory::InitializeFunction(Handle<JSFunction> function,
                                  Handle<SharedFunctionInfo> info,
                                  Handle<Context> context,

diff --git a/src/factory.h b/src/factory.h
index 8549938e61b1b9629830080144ac77d8a9a9c5ed..caabac8fbf51d79a83e1b9e2b43647074d6875c4 100644 (file)
--- a/src/factory.h
+++ b/src/factory.h
@@ -607,6 +607,16 @@ class Factory V8_FINAL {
       Handle<Object> script,
       Handle<Object> stack_frames);
 
+  Handle<SeededNumberDictionary> DictionaryAtNumberPut(
+      Handle<SeededNumberDictionary>,
+      uint32_t key,
+      Handle<Object> value);
+
+  Handle<UnseededNumberDictionary> DictionaryAtNumberPut(
+      Handle<UnseededNumberDictionary>,
+      uint32_t key,
+      Handle<Object> value);
+
 #ifdef ENABLE_DEBUGGER_SUPPORT
   Handle<DebugInfo> NewDebugInfo(Handle<SharedFunctionInfo> shared);
 #endif

diff --git a/src/objects.cc b/src/objects.cc
index 34fdf253430fe9904055ba1a87ed359bec4f4aca..9f500424fdfbd36df4ffbf067f7a2b698ce84715 100644 (file)
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -16064,26 +16064,15 @@ Handle<UnseededNumberDictionary> UnseededNumberDictionary::AddNumberEntry(
 }
 
 
-Handle<SeededNumberDictionary> SeededNumberDictionary::AtNumberPut(
-    Handle<SeededNumberDictionary> dictionary,
-    uint32_t key,
-    Handle<Object> value) {
-  dictionary->UpdateMaxNumberKey(key);
-  CALL_HEAP_FUNCTION(
-      dictionary->GetIsolate(),
-      dictionary->AtPut(key, *value),
-      SeededNumberDictionary);
+MaybeObject* SeededNumberDictionary::AtNumberPut(uint32_t key, Object* value) {
+  UpdateMaxNumberKey(key);
+  return AtPut(key, value);
 }
 
 
-Handle<UnseededNumberDictionary> UnseededNumberDictionary::AtNumberPut(
-    Handle<UnseededNumberDictionary> dictionary,
-    uint32_t key,
-    Handle<Object> value) {
-  CALL_HEAP_FUNCTION(
-      dictionary->GetIsolate(),
-      dictionary->AtPut(key, *value),
-      UnseededNumberDictionary);
+MaybeObject* UnseededNumberDictionary::AtNumberPut(uint32_t key,
+                                                   Object* value) {
+  return AtPut(key, value);
 }
 
 

diff --git a/src/objects.h b/src/objects.h
index 85807ee34629df866445e9e7c0163706367a88c3..dc8aa7a4a17ce58ffe99573bdfc169040bdfc185 100644 (file)
--- a/src/objects.h
+++ b/src/objects.h
@@ -4193,10 +4193,7 @@ class SeededNumberDictionary
   }
 
   // Type specific at put (default NONE attributes is used when adding).
-  MUST_USE_RESULT static Handle<SeededNumberDictionary> AtNumberPut(
-      Handle<SeededNumberDictionary> dictionary,
-      uint32_t key,
-      Handle<Object> value);
+  MUST_USE_RESULT MaybeObject* AtNumberPut(uint32_t key, Object* value);
   MUST_USE_RESULT static Handle<SeededNumberDictionary> AddNumberEntry(
       Handle<SeededNumberDictionary> dictionary,
       uint32_t key,
@@ -4248,10 +4245,7 @@ class UnseededNumberDictionary
   }
 
   // Type specific at put (default NONE attributes is used when adding).
-  MUST_USE_RESULT static Handle<UnseededNumberDictionary> AtNumberPut(
-      Handle<UnseededNumberDictionary> dictionary,
-      uint32_t key,
-      Handle<Object> value);
+  MUST_USE_RESULT MaybeObject* AtNumberPut(uint32_t key, Object* value);
   MUST_USE_RESULT static Handle<UnseededNumberDictionary> AddNumberEntry(
       Handle<UnseededNumberDictionary> dictionary,
       uint32_t key,

diff --git a/src/runtime.cc b/src/runtime.cc
index 812d1dab08c610b27d45192942a3bbcf4bffaba2..b45f6e3343efd03597ac83d86f49260887203a9f 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -9979,7 +9979,7 @@ class ArrayConcatVisitor {
     Handle<SeededNumberDictionary> dict(
         SeededNumberDictionary::cast(*storage_));
     Handle<SeededNumberDictionary> result =
-        SeededNumberDictionary::AtNumberPut(dict, index, elm);
+        isolate_->factory()->DictionaryAtNumberPut(dict, index, elm);
     if (!result.is_identical_to(dict)) {
       // Dictionary needed to grow.
       clear_storage();
@@ -10029,7 +10029,7 @@ class ArrayConcatVisitor {
       Handle<Object> element(current_storage->get(i), isolate_);
       if (!element->IsTheHole()) {
         Handle<SeededNumberDictionary> new_storage =
-            SeededNumberDictionary::AtNumberPut(slow_storage, i, element);
+          isolate_->factory()->DictionaryAtNumberPut(slow_storage, i, element);
         if (!new_storage.is_identical_to(slow_storage)) {
           slow_storage = loop_scope.CloseAndEscape(new_storage);
         }

diff --git a/src/type-info.cc b/src/type-info.cc
index 64a8dffc2ca2a8dfcee4fe56653b4fb96206d2fb..71236f7d9c3c81af556ec3c0cd54a0be7b51956d 100644 (file)
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -495,7 +495,7 @@ void TypeFeedbackOracle::SetInfo(TypeFeedbackId ast_id, Object* target) {
   // Dictionary has been allocated with sufficient size for all elements.
   DisallowHeapAllocation no_need_to_resize_dictionary;
   HandleScope scope(isolate());
-  UnseededNumberDictionary::AtNumberPut(
+  isolate()->factory()->DictionaryAtNumberPut(
       dictionary_, IdToKey(ast_id), handle(target, isolate()));
 }