From e918a3c855c4ca3942910e2dce65ec9bfee95d7a Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Fri, 6 Jul 2018 18:16:24 +0200
Subject: [PATCH] Bug 1472973 part 8 - Use JS::GetNonCCWObjectGlobal in
 XrayAwareCalleeGlobal. r=bz

---
 js/xpconnect/wrappers/XrayWrapper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 256c7b34f79f..fbe901033ccf 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -127,7 +127,7 @@ XrayAwareCalleeGlobal(JSObject* fun)
 
   if (!js::FunctionHasNativeReserved(fun)) {
       // Just a normal function, no Xrays involved.
-      return js::GetGlobalForObjectCrossCompartment(fun);
+      return JS::GetNonCCWObjectGlobal(fun);
   }
 
   // The functions we expect here have the Xray wrapper they're associated with