Skip to content

Commit 88feddf

Browse files
committed
Get test_source_map passing again.
1 parent d50e7b4 commit 88feddf

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

emcc

+1
Original file line numberDiff line numberDiff line change
@@ -1524,6 +1524,7 @@ try:
15241524
if DEBUG == '2':
15251525
# Clean up the syntax a bit
15261526
final = shared.Building.js_optimizer(final, [], jcache, make_source_map)
1527+
js_transform_tempfiles.append(final)
15271528
if DEBUG: save_intermediate('pretty')
15281529

15291530
def get_eliminate():

tools/eliminator/node_modules/uglify-js/lib/process.js

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/js-optimizer.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,9 @@ function simplifyExpressionsPre(ast) {
442442
traverse(ast, function process(node, type, stack) {
443443
if (type == 'binary' && node[1] == '|') {
444444
if (node[2][0] == 'num' && node[3][0] == 'num') {
445-
return ['num', node[2][1] | node[3][1]];
445+
// pass node[2][0] instead of 'num' because it might be a token
446+
// object with line numbers attached.
447+
return [node[2][0], node[2][1] | node[3][1]];
446448
} else if (jsonCompare(node[2], ZERO) || jsonCompare(node[3], ZERO)) {
447449
// We might be able to remove this correction
448450
for (var i = stack.length-1; i >= 0; i--) {

0 commit comments

Comments
 (0)