This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281

Merged
jkotas merged 4 commits into from
Aug 25, 2020
Merged

Wasm: upgrade emscripten for an llvm and exception fixes. #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7975df7
upgrade emscripten for some llvm and exception fixes.
yowl Aug 25, 2020
be866f3
move commit past version that has 2.0.1
yowl Aug 25, 2020
93bb6c0
revert to 2.0.0 which is ok locally.
yowl Aug 25, 2020
40a44b8
Update ILToWebAssemblyImporter.cs
yowl Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/how-to-build-WebAssembly.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html).
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down
6 changes: 3 additions & 3 deletions eng/install-emscripten.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down
25 changes: 24 additions & 1 deletion src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
BuildFinallyFunclet(Module);
}

var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
// __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

// unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

landingPadBuilder.PositionAtEnd(foundCatchBlock);
// finished with the c++ exception
landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
{
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
return landingPad;
}

LLVMValueRef GetCxaBeginCatchFunction()
{
if (CxaBeginCatchFunction == default)
{
// takes the exception structure and returns the c++ exception, defined by emscripten
CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0),
new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
}
return CxaBeginCatchFunction;
}

LLVMValueRef GetCxaEndCatchFunction()
{
if (CxaEndCatchFunction == default)
{
CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
}
return CxaEndCatchFunction;
}

private void AddMethodReference(MethodDesc method)
{
_dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down
2 changes: 2 additions & 0 deletions src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
static LLVMValueRef TrapFunction = default(LLVMValueRef);
static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Wasm: upgrade emscripten for an llvm and exception fixes.#8281
 Merged

jkotas
merged 4 commits into

from

Aug 25, 2020
 Merged


Wasm: upgrade emscripten for an llvm and exception fixes.
#8281
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
7975df7

upgrade emscripten for some llvm and exception fixes.


yowl Aug 25, 2020
be866f3

move commit past version that has 2.0.1


yowl Aug 25, 2020
93bb6c0

revert to 2.0.0 which is ok locally.


yowl Aug 25, 2020
40a44b8

Update ILToWebAssemblyImporter.cs


yowl Aug 25, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
Documentation/how-to-build-WebAssembly.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
## Build WebAssembly on Windows ##

1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 1.39.19 ```./emsdk install 1.39.19``` followed by ```./emsdk activate 1.39.19```
2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to 2.0.1 ```./emsdk install 2.0.0``` followed by ```./emsdk activate 2.0.0```
3. Install [Firefox](https://www.getfirefox.com) (for testing).
3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md).
4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root.
Expand Down

6 changes: 3 additions & 3 deletions
eng/install-emscripten.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ git clone https://github.com/emscripten-core/emsdk.git

cd emsdk
rem checkout a known good version to avoid a random break when emscripten changes the top of tree.
git checkout dec8a63
git checkout c1f0ad9

powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0update-machine-certs.ps1""" %*"

rem Use the python that is downloaded to native-tools explicitly as its not on the path
call "%1"\..\native-tools\bin\python3 emsdk.py install 1.39.19
call "%1"\..\native-tools\bin\python3 emsdk.py install 2.0.0
if %errorlevel% NEQ 0 goto fail
call emsdk activate 1.39.19
call emsdk activate 2.0.0
if %errorlevel% NEQ 0 goto fail

exit /b 0
Expand Down

25 changes: 24 additions & 1 deletion
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2901,7 +2901,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 BuildFinallyFunclet(Module);
 }

 var exPtr = landingPadBuilder.BuildExtractValue(pad, 0, "ex");
 // __cxa_begin catch to get the c++ exception object, must be paired with __cxa_end_catch (http://libcxxabi.llvm.org/spec.html)
 var exPtr = landingPadBuilder.BuildCall(GetCxaBeginCatchFunction(), new LLVMValueRef[] { landingPadBuilder.BuildExtractValue(pad, 0, "ex") });

 // unwrap managed, cast to 32bit pointer from 8bit personality signature pointer
 var ex32Ptr = landingPadBuilder.BuildPointerCast(exPtr, LLVMTypeRef.CreatePointer(LLVMTypeRef.Int32, 0));
Expand DownExpand Up@@ -2953,6 +2954,8 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 landingPadBuilder.BuildCondBr(noCatch, secondPassBlock, foundCatchBlock);

 landingPadBuilder.PositionAtEnd(foundCatchBlock);
 // finished with the c++ exception
 landingPadBuilder.BuildCall(GetCxaEndCatchFunction(), new LLVMValueRef[] { });

 LLVMValueRef[] callCatchArgs = new LLVMValueRef[]
 {
Expand DownExpand Up@@ -3026,6 +3029,26 @@ private LLVMBasicBlockRef GetOrCreateLandingPad(ExceptionRegion tryRegion)
 return landingPad;
 }

 LLVMValueRef GetCxaBeginCatchFunction()
 {
 if (CxaBeginCatchFunction == default)
 {
 // takes the exception structure and returns the c++ exception, defined by emscripten
 CxaBeginCatchFunction = Module.AddFunction("__cxa_begin_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0), 
 new LLVMTypeRef[] { LLVMTypeRef.CreatePointer(LLVMTypeRef.Int8, 0)}, false));
 }
 return CxaBeginCatchFunction;
 }

 LLVMValueRef GetCxaEndCatchFunction()
 {
 if (CxaEndCatchFunction == default)
 {
 CxaEndCatchFunction = Module.AddFunction("__cxa_end_catch", LLVMTypeRef.CreateFunction(LLVMTypeRef.Void, new LLVMTypeRef[] { }, false));
 }
 return CxaEndCatchFunction;
 }

 private void AddMethodReference(MethodDesc method)
 {
 _dependencies.Add(_compilation.NodeFactory.MethodEntrypoint(method));
Expand Down

2 changes: 2 additions & 0 deletions
src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter_Statics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,8 @@ public static void CompileMethod(WebAssemblyCodegenCompilation compilation, WebA
 static LLVMValueRef DebugtrapFunction = default(LLVMValueRef);
 static LLVMValueRef TrapFunction = default(LLVMValueRef);
 static LLVMValueRef DoNothingFunction = default(LLVMValueRef);
 static LLVMValueRef CxaBeginCatchFunction = default(LLVMValueRef);
 static LLVMValueRef CxaEndCatchFunction = default(LLVMValueRef);
 static LLVMValueRef RhpThrowEx = default(LLVMValueRef);
 static LLVMValueRef RhpCallCatchFunclet = default(LLVMValueRef);
 static LLVMValueRef LlvmCatchFunclet = default(LLVMValueRef);
Expand Down