Revert of Embedded constant pools.

src/ic/ic-inl.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_IC_INL_H_
 #define V8_IC_INL_H_
 
 #include "src/ic/ic.h"
 
 #include "src/compiler.h"
@@ skipping 30 matching lines @@
     // the call which has been overwritten by the DebugBreakXXX resides
     // and the place where the inline cache system should look.
     return result + delta;
   } else {
     // No break point here just return the address of the call.
     return result;
   }
 }
 
 
-Address IC::constant_pool() const {
-  if (!FLAG_enable_embedded_constant_pool) {
+ConstantPoolArray* IC::constant_pool() const {
+  if (!FLAG_enable_ool_constant_pool) {
     return NULL;
   } else {
-    Address constant_pool = raw_constant_pool();
+    Handle<ConstantPoolArray> result = raw_constant_pool_;
     Debug* debug = isolate()->debug();
     // First check if any break points are active if not just return the
     // original constant pool.
-    if (!debug->has_break_points()) return constant_pool;
+    if (!debug->has_break_points()) return *result;
 
     // At least one break point is active perform additional test to ensure that
     // break point locations are updated correctly.
     Address target = Assembler::target_address_from_return_address(pc());
     if (debug->IsDebugBreak(
-            Assembler::target_address_at(target, constant_pool))) {
+            Assembler::target_address_at(target, raw_constant_pool()))) {
       // If the call site is a call to debug break then we want to return the
       // constant pool for the original code instead of the breakpointed code.
       return GetOriginalCode()->constant_pool();
     }
-    return constant_pool;
+    return *result;
   }
 }
 
 
-Address IC::raw_constant_pool() const {
-  if (FLAG_enable_embedded_constant_pool) {
-    return *constant_pool_address_;
+ConstantPoolArray* IC::raw_constant_pool() const {
+  if (FLAG_enable_ool_constant_pool) {
+    return *raw_constant_pool_;
   } else {
     return NULL;
   }
 }
 
 
-Code* IC::GetTargetAtAddress(Address address, Address constant_pool) {
+Code* IC::GetTargetAtAddress(Address address,
+                             ConstantPoolArray* constant_pool) {
   // Get the target address of the IC.
   Address target = Assembler::target_address_at(address, constant_pool);
   // Convert target address to the code object. Code::GetCodeFromTargetAddress
   // is safe for use during GC where the map might be marked.
   Code* result = Code::GetCodeFromTargetAddress(target);
   DCHECK(result->is_inline_cache_stub());
   return result;
 }
 
 
 void IC::SetTargetAtAddress(Address address, Code* target,
-                            Address constant_pool) {
+                            ConstantPoolArray* constant_pool) {
   if (AddressIsDeoptimizedCode(target->GetIsolate(), address)) return;
 
   DCHECK(target->is_inline_cache_stub() || target->is_compare_ic_stub());
 
   // Don't use this for load_ics when --vector-ics is turned on.
   DCHECK(!target->is_inline_cache_stub() ||
          (target->kind() != Code::LOAD_IC &&
           target->kind() != Code::KEYED_LOAD_IC));
 
   Heap* heap = target->GetHeap();
@@ skipping 122 matching lines @@
 bool IC::AddressIsDeoptimizedCode(Isolate* isolate, Address address) {
   Code* host =
       isolate->inner_pointer_to_code_cache()->GetCacheEntry(address)->code;
   return (host->kind() == Code::OPTIMIZED_FUNCTION &&
           host->marked_for_deoptimization());
 }
 }
 }  // namespace v8::internal
 
 #endif  // V8_IC_INL_H_