Merge arguments branch to bleeding edge (second try).

src/runtime-profiler.cc

 // Copyright 2011 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 167 matching lines @@
 
   SharedFunctionInfo* shared = function->shared();
   // If the code is not optimizable or references context slots, don't try OSR.
   if (!shared->code()->optimizable() || !shared->allows_lazy_compilation()) {
     return;
   }
 
   // We are not prepared to do OSR for a function that already has an
   // allocated arguments object.  The optimized code would bypass it for
   // arguments accesses, which is unsound.  Don't try OSR.
-  if (shared->scope_info()->HasArgumentsShadow()) return;
+  if (shared->uses_arguments()) return;
 
   // We're using on-stack replacement: patch the unoptimized code so that
   // any back edge in any unoptimized frame will trigger on-stack
   // replacement for that frame.
   if (FLAG_trace_osr) {
     PrintF("[patching stack checks in ");
     function->PrintName();
     PrintF(" for on-stack replacement]\n");
   }
 
@@ skipping 281 matching lines @@
     } else {
       return RuntimeProfiler::WaitForSomeIsolateToEnterJS();
     }
   }
 #endif
   return false;
 }
 
 
 } }  // namespace v8::internal