Merge bleeding_edge r17376:17693.

src/v8.cc

 // Copyright 2012 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 153 matching lines @@
   }
   if (has_call_completed_callbacks) {
     for (int i = 0; i < call_completed_callbacks_->length(); i++) {
       call_completed_callbacks_->at(i)();
     }
   }
   handle_scope_implementer->DecrementCallDepth();
 }
 
 
-// Use a union type to avoid type-aliasing optimizations in GCC.
-typedef union {
-  double double_value;
-  uint64_t uint64_t_value;
-} double_int_union;
-
-
-Object* V8::FillHeapNumberWithRandom(Object* heap_number,
-                                     Context* context) {
-  double_int_union r;
-  uint64_t random_bits = Random(context);
-  // Convert 32 random bits to 0.(32 random bits) in a double
-  // by computing:
-  // ( 1.(20 0s)(32 random bits) x 2^20 ) - (1.0 x 2^20)).
-  static const double binary_million = 1048576.0;
-  r.double_value = binary_million;
-  r.uint64_t_value |= random_bits;
-  r.double_value -= binary_million;
-
-  HeapNumber::cast(heap_number)->set_value(r.double_value);
-  return heap_number;
-}
-
-
 void V8::InitializeOncePerProcessImpl() {
   FlagList::EnforceFlagImplications();
   if (FLAG_stress_compaction) {
     FLAG_force_marking_deque_overflows = true;
     FLAG_gc_global = true;
     FLAG_max_new_space_size = (1 << (kPageSizeBits - 10)) * 2;
   }
 
   if (FLAG_concurrent_recompilation &&
       (FLAG_trace_hydrogen || FLAG_trace_hydrogen_stubs)) {
     FLAG_concurrent_recompilation = false;
+    FLAG_concurrent_osr = false;
     PrintF("Concurrent recompilation has been disabled for tracing.\n");
   }
 
   if (FLAG_sweeper_threads <= 0) {
     if (FLAG_concurrent_sweeping) {
       FLAG_sweeper_threads = SystemThreadManager::
           NumberOfParallelSystemThreads(
               SystemThreadManager::CONCURRENT_SWEEPING);
     } else if (FLAG_parallel_sweeping) {
       FLAG_sweeper_threads = SystemThreadManager::
           NumberOfParallelSystemThreads(
               SystemThreadManager::PARALLEL_SWEEPING);
     }
     if (FLAG_sweeper_threads == 0) {
       FLAG_concurrent_sweeping = false;
       FLAG_parallel_sweeping = false;
     }
   } else if (!FLAG_concurrent_sweeping && !FLAG_parallel_sweeping) {
     FLAG_sweeper_threads = 0;
   }
 
   if (FLAG_concurrent_recompilation &&
       SystemThreadManager::NumberOfParallelSystemThreads(
-          SystemThreadManager::PARALLEL_RECOMPILATION) == 0) {
+          SystemThreadManager::CONCURRENT_RECOMPILATION) == 0) {
     FLAG_concurrent_recompilation = false;
+    FLAG_concurrent_osr = false;
   }
 
   Sampler::SetUp();
   CPU::SetUp();
   OS::PostSetUp();
   ElementsAccessor::InitializeOncePerProcess();
   LOperand::SetUpCaches();
   SetUpJSCallerSavedCodeData();
   ExternalReference::SetUp();
   Bootstrapper::InitializeOncePerProcess();
 }
 
 
 void V8::InitializeOncePerProcess() {
   CallOnce(&init_once, &InitializeOncePerProcessImpl);
 }
 
 } }  // namespace v8::internal