Reviewers: Kasper Lund,

Description:
Merge r2642 to trunk.

Please review this at http://codereview.chromium.org/164141

SVN Base: http://v8.googlecode.com/svn/trunk/

Affected files:
   M     src/execution.cc
   M     src/version.cc


Index: src/execution.cc
===================================================================
--- src/execution.cc    (revision 2644)
+++ src/execution.cc    (working copy)
@@ -83,6 +83,14 @@
      code = stub.GetCode();
    }

+  // Convert calls on global objects to be calls on the global
+  // receiver instead to avoid having a 'this' pointer which refers
+  // directly to a global object.
+  if (receiver->IsGlobalObject()) {
+    Handle<GlobalObject> global = Handle<GlobalObject>::cast(receiver);
+    receiver = Handle<JSObject>(global->global_receiver());
+  }
+
    {
      // Save and restore context around invocation and block the
      // allocation of handles without explicit handle scopes.
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 2644)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
  #define MAJOR_VERSION     1
  #define MINOR_VERSION     3
  #define BUILD_NUMBER      2
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
  #define CANDIDATE_VERSION false

  // Define SONAME to have the SCons build the put a specific SONAME into the



--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to