641078 - dehydra jsapi update: remove JSScript and callable regex

Status: RESOLVED FIXED

(Developer Infrastructure :: Source Code Analysis, defect)

Description

[Ehren Metcalfe]

Attachment: patch

tested w/ mc, tm and 1.8.0

Comment 1

[(dormant account)]

Comment on attachment 518799 [details] [diff] [review]
patch


>+/* JSScript removed from JSAPI in newer SpiderMonkeys */
>+#ifndef JS_NewScriptObject
>+#define JS_NewScriptObject(cx, script) (script)
>+#define JSScript JSObject
>+#endif

Just remove JS_Script* from source

Comment 2

[Ehren Metcalfe]

> Just remove JS_Script* from source

I took the fix from http://groups.google.com/group/mozilla.dev.tech.js-engine/browse_thread/thread/78ec91ce03319d3a?tvc=2

context:

  JSScript *script = JS_CompileScript(this->cx, namespace,
                                      content, size, realname, 1);
  free(realname);
  if (script == NULL) {
    xassert(JS_IsExceptionPending(this->cx));
    return JS_FALSE;
  }

  JSObject *sobj = JS_NewScriptObject(this->cx, script);
  JS_AddNamedObjectRoot(this->cx, &sobj, filename);
  jsval rval;
  JSBool rv = JS_ExecuteScript(this->cx, namespace, script, &rval);
  JS_RemoveObjectRoot(this->cx, &sobj);

Old sm still expects a JSScript for JS_CompileScript and JS_ExecuteScript or are you saying drop old spidermonkey? :)

Comment 3

[(dormant account)]

yes, drop preff4 spidermonkey

Comment 4

[Ehren Metcalfe]

Attachment: patch

only tested on mc tip but jsapi should be same as branch

Comment 5

[(dormant account)]

Comment on attachment 518827 [details] [diff] [review]
patch

thanks

Comment 6

[Ehren Metcalfe]

np, http://hg.mozilla.org/rewriting-and-analysis/dehydra/rev/9871caaedb8f