Closed Bug 1252713 Opened 4 years ago Closed 4 years ago

Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

Categories

(Core :: JavaScript Engine, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
mozilla47
Tracking Status
firefox46 --- fixed
firefox47 --- fixed

People

(Reporter: fitzgen, Assigned: fitzgen)

References

Details

Attachments

(1 file, 1 obsolete file)

No description provided.
Assignee: nobody → nfitzgerald
No longer blocks: 1251675
Status: NEW → ASSIGNED
Gah mid-air :(
Blocks: 1251675
Comment on attachment 8725497 [details] [diff] [review]
Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

Review of attachment 8725497 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks! Sorry you got stuck with the short straw this time.
Attachment #8725497 - Flags: review?(terrence) → review+
Fix the bad header include order in the last patch.
Attachment #8725741 - Flags: review?(terrence)
Attachment #8725497 - Attachment is obsolete: true
Comment on attachment 8725741 [details] [diff] [review]
Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

Review of attachment 8725741 [details] [diff] [review]:
-----------------------------------------------------------------

Yup, still good to go.
Attachment #8725741 - Flags: review?(terrence) → review+
https://hg.mozilla.org/mozilla-central/rev/4b2af03fba36
Status: ASSIGNED → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla47
Somehow this also affects building on ppc with unified sources in 46. Can this be uplifted?
Flags: needinfo?(nfitzgerald)
(In reply to Mike Hommey [:glandium] from comment #10)
> Somehow this also affects building on ppc with unified sources in 46. Can
> this be uplifted?

In file included from /«PKGBUILDDIR»/build-browser/js/src/jsapi-tests/Unified_cpp_js_src_jsapi-tests5.cpp:11:0:
/«PKGBUILDDIR»/js/src/jsapi-tests/testXDR.cpp: In member function 'virtual bool cls_testXDR_sourceMap::run(JS::HandleObject)':
/«PKGBUILDDIR»/js/src/jsapi-tests/testXDR.cpp:133:9: error: 'UniqueTwoByteChars' was not declared in this scope
         UniqueTwoByteChars expected_wrapper(js::InflateString(cx, *sm, &len));
         ^
/«PKGBUILDDIR»/js/src/jsapi-tests/testXDR.cpp:133:9: note: suggested alternatives:
In file included from /«PKGBUILDDIR»/build-browser/dist/include/js/HeapAPI.h:15:0,
                 from /«PKGBUILDDIR»/build-browser/dist/include/js/GCAPI.h:12,
                 from /«PKGBUILDDIR»/build-browser/dist/include/js/RootingAPI.h:19,
                 from /«PKGBUILDDIR»/build-browser/dist/include/js/GCVector.h:12,
                 from /«PKGBUILDDIR»/js/src/jscntxt.h:14,
                 from /«PKGBUILDDIR»/js/src/vm/RegExpObject.h:13,
                 from /«PKGBUILDDIR»/js/src/builtin/RegExp.h:10,
                 from /«PKGBUILDDIR»/js/src/jscompartment.h:15,
                 from /«PKGBUILDDIR»/js/src/jsapi-tests/testWeakMap.cpp:8,
                 from /«PKGBUILDDIR»/build-browser/js/src/jsapi-tests/Unified_cpp_js_src_jsapi-tests5.cpp:2:
/«PKGBUILDDIR»/build-browser/dist/include/js/Utility.h:489:56: note:   'JS::UniqueTwoByteChars'
 typedef mozilla::UniquePtr<char16_t[], JS::FreePolicy> UniqueTwoByteChars;
                                                        ^
/«PKGBUILDDIR»/build-browser/dist/include/js/Utility.h:489:56: note:   'JS::UniqueTwoByteChars'
Comment on attachment 8725741 [details] [diff] [review]
Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

Approval Request Comment
[Feature/regressing bug #]:
Unclear; probably many.

[User impact if declined]:
PPC builds will apparently break?

[Describe test coverage new/current, TreeHerder]:
Didn't introduce any changes, just added missing forward declarations and #includes. So all the existing tests which have been passing since this was landed.

[Risks and why]:
Very little, this is all trivial changes and assessing potential breakage is as simple as checking that the build completes successfully.

[String/UUID change made/needed]:
None.
Flags: needinfo?(nfitzgerald)
Attachment #8725741 - Flags: approval-mozilla-aurora?
Comment on attachment 8725741 [details] [diff] [review]
Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

I was told that this is needed for Linux Distro builds. Aurora47+
Attachment #8725741 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
(In reply to Mike Hommey [:glandium] from comment #10)
> Somehow this also affects building on ppc with unified sources in 46. Can
> this be uplifted?

Nick, if we need this on 46, you need to request an uplift to Beta (46).
Flags: needinfo?(nfitzgerald)
It's already on aurora, by virtue of having landed during on m-c during the 47 cycle.
Comment on attachment 8725741 [details] [diff] [review]
Fix FILES_PER_UNIFIED_FILE=1 bustage in js/

Ok since this is already in 47, it needs uplifting to Beta46. Taking it.
Flags: needinfo?(nfitzgerald)
Attachment #8725741 - Flags: approval-mozilla-aurora+ → approval-mozilla-beta+
backed out for bustage like https://treeherder.mozilla.org/logviewer.html#?job_id=902094&repo=mozilla-beta
Flags: needinfo?(nfitzgerald)
Flags: needinfo?(nfitzgerald) → needinfo?(mh+mozilla)
No wonder it failed, Policy.h didn't exist in beta so the patch actually didn't apply.
Flags: needinfo?(mh+mozilla)
(In reply to Mike Hommey [:glandium] from comment #20)
> No wonder it failed, Policy.h didn't exist in beta so the patch actually
> didn't apply.

In fact, the build went through, so I presume the only thing that was a problem is Policy.h existing. Carsten, can you reland without Policy.h (how did you end up adding the file, instead of bailing, btw?)
Flags: needinfo?(cbook)
Flags: needinfo?(cbook)
You need to log in before you can comment on or make changes to this bug.