Do another merge using nifty new merge script (CL for that coming soon).

third_party/WebKit/JavaScriptCore/runtime/JSGlobalData.h

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 49 matching lines @@
         static JSGlobalData& sharedInstance();
 
         static PassRefPtr<JSGlobalData> create();
         static PassRefPtr<JSGlobalData> createLeaked();
         ~JSGlobalData();
 
         Machine* machine;
 
         JSValue* exception;
 #if ENABLE(CTI)
-        void* throwReturnAddress;
+        void* exceptionLocation;
 #endif
 
         const HashTable* arrayTable;
         const HashTable* dateTable;
         const HashTable* mathTable;
         const HashTable* numberTable;
         const HashTable* regExpTable;
         const HashTable* regExpConstructorTable;
         const HashTable* stringTable;
         
@@ skipping 36 matching lines @@
 
     private:
         JSGlobalData(bool isShared = false);
 
         static JSGlobalData*& sharedInstanceInternal();
     };
 
 }
 
 #endif