fix asm var defs of illegals
Merge branch 'incoming' into asm_js_nomerge