Fix CALL_NON_FUNCTION. If a builtin is not resolved at runtime (happened at b...

src/bootstrapper.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 187 matching lines @@
     if (!f->is_compiled()) {
       // Do lazy compilation and check for stack overflows.
       if (!CompileLazy(f, CLEAR_EXCEPTION)) {
         Clear();
         return false;
       }
     }
     Code* code = Code::cast(code_[i]);
     Address pc = code->instruction_start() + pc_[i];
     bool is_pc_relative = Bootstrapper::FixupFlagsIsPCRelative::decode(flags);
-    if (is_pc_relative) {
+    bool use_code_object = Bootstrapper::FixupFlagsUseCodeObject::decode(flags);
+
+    if (use_code_object) {
+      if (is_pc_relative) {
+        Assembler::set_target_address_at(
+            pc, reinterpret_cast<Address>(f->code()));
+      } else {
+        *reinterpret_cast<Object**>(pc) = f->code();
+      }
+    } else {
+      ASSERT(is_pc_relative);

[iposva, 2008/11/10 22:38:57]

Please add a comment why this assert is necessary. We just discussed this 5
minutes ago and it was already unclear to me.

[Feng Qian, 2008/11/11 18:36:40]

As we discussed, current IA32 and ARM can only have 3 states in 4 combined
states. No logic reason that an address has to be pc relative.

On 2008/11/10 22:38:57, iposva wrote:

       Assembler::set_target_address_at(pc, f->code()->instruction_start());
-    } else {
-      *reinterpret_cast<Object**>(pc) = f->code();
     }
+
     LOG(StringEvent("resolved", name));
   }
   Clear();
 
   // TODO(1240818): We should probably try to avoid doing this for all
   // the V8 builtin JS files. It should only happen after running
   // runtime.js - just like there shouldn't be any fixups left after
   // that.
   for (int i = 0; i < Builtins::NumberOfJavaScriptBuiltins(); i++) {
     Builtins::JavaScript id = static_cast<Builtins::JavaScript>(i);
@@ skipping 1225 matching lines @@
   if (!ConfigureGlobalObjects(global_template)) return;
 
   if (!InstallExtensions(extensions)) return;
 
   if (!InstallSpecialObjects()) return;
 
   result_ = global_context_;
 }
 
 } }  // namespace v8::internal