Merge arguments branch to bleeding merge.

src/factory.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 232 matching lines @@
 Handle<Context> Factory::NewFunctionContext(int length,
                                             Handle<JSFunction> closure) {
   CALL_HEAP_FUNCTION(
       isolate(),
       isolate()->heap()->AllocateFunctionContext(length, *closure),
       Context);
 }
 
 
 Handle<Context> Factory::NewCatchContext(Handle<Context> previous,
-                                         Handle<String> name,
-                                         Handle<Object> thrown_object) {
+                                         Handle<JSObject> extension) {
   CALL_HEAP_FUNCTION(
       isolate(),
-      isolate()->heap()->AllocateCatchContext(*previous, *name, *thrown_object),
+      isolate()->heap()->AllocateCatchContext(*previous, *extension),
       Context);
 }
 
 
 Handle<Context> Factory::NewWithContext(Handle<Context> previous,
                                         Handle<JSObject> extension) {
   CALL_HEAP_FUNCTION(
       isolate(),
       isolate()->heap()->AllocateWithContext(*previous, *extension),
       Context);
@@ skipping 962 matching lines @@
     Execution::ConfigureInstance(instance,
                                  instance_template,
                                  pending_exception);
   } else {
     *pending_exception = false;
   }
 }
 
 
 } }  // namespace v8::internal