1041370 - Bug 950745 is going to cause perma-bustage once merged to Aurora due to changes to js/src/vm/Runtime.h

Status: RESOLVED FIXED

Description

[Ryan VanderMeulen [:RyanVM]]

This is going to burn once uplifted to Aurora tomorrow. Probably going to want to get this fix landed directly on m-c first :)

https://tbpl.mozilla.org/php/getParsedLog.php?id=44242133&tree=Try

In file included from /builds/slave/try-osx64_g-000000000000000000/build/js/src/builtin/RegExp.cpp:7:
In file included from /builds/slave/try-osx64_g-000000000000000000/build/js/src/builtin/RegExp.h:10:
In file included from /builds/slave/try-osx64_g-000000000000000000/build/js/src/vm/RegExpObject.h:13:
In file included from /builds/slave/try-osx64_g-000000000000000000/build/js/src/jscntxt.h:15:
/builds/slave/try-osx64_g-000000000000000000/build/js/src/vm/Runtime.h:1039:9: error: no type named 'AssertOnScriptEntryHook' in namespace 'js'
    js::AssertOnScriptEntryHook assertOnScriptEntryHook_;
    ~~~~^
1 error generated.
make[5]: *** [RegExp.o] Error 1

Comment 1

[Ryan VanderMeulen [:RyanVM]]

In case you're curious what bits were twiddled on Try to simulate this:
https://hg.mozilla.org/try/rev/8c88266cff8a

Comment 2

[Bill McCloskey [inactive unless it's an emergency] (:billm)]

Oops, sorry. I checked that this fixes the problem locally:

https://hg.mozilla.org/mozilla-central/rev/e743fd8c57ed

I'm sorry to push this without review, but I'll be out tomorrow and I don't think anyone is around now.

Comment 3

[Bill McCloskey [inactive unless it's an emergency] (:billm)]

I guess this is fixed?