Skip to content

Commit eb15c86

Browse files
committed
Merge branch 'master' of github.com:kripken/sql.js
2 parents 760d684 + 8c52477 commit eb15c86

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
- uses: actions/checkout@v1
1010
- uses: mymindstorm/setup-emsdk@v1
1111
with:
12-
version: '1.38.48'
12+
version: '1.39.8-fastcomp'
1313
- uses: actions/cache@v1
1414
id: cache
1515
with:
1616
path: ~/.emscripten_cache
17-
key: emscripten-1.38.48
17+
key: emscripten-1.39.8-fastcomp
1818
- name: make
1919
run: make
2020
- name: test

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: mymindstorm/setup-emsdk@v1
1616
with:
17-
version: '1.38.48'
17+
version: '1.39.8-fastcomp'
1818
- name: make
1919
run: make
2020
- name: Create Release

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CFLAGS = \
3232
EMFLAGS = \
3333
--memory-init-file 0 \
3434
-s RESERVED_FUNCTION_POINTERS=64 \
35+
-s ALLOW_TABLE_GROWTH=1 \
3536
-s EXPORTED_FUNCTIONS=@src/exported_functions.json \
3637
-s EXTRA_EXPORTED_RUNTIME_METHODS=@src/exported_runtime_methods.json \
3738
-s SINGLE_FILE=0 \
@@ -51,6 +52,8 @@ EMFLAGS_WASM = \
5152
EMFLAGS_OPTIMIZED= \
5253
-s INLINING_LIMIT=50 \
5354
-O3 \
55+
-flto \
56+
--llvm-lto 1 \
5457
--closure 1
5558

5659
EMFLAGS_DEBUG = \

src/api.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,8 @@ Module["onRuntimeInitialized"] = (function onRuntimeInitialized() {
874874
@param func [Function] the actual function to be executed.
875875
*/
876876
Database.prototype["create_function"] = function create_function(name, func) {
877+
// TODO : add type arguments for compatibility with the llvm backend
878+
// https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html#calling-javascript-functions-as-function-pointers-from-c
877879
var func_ptr;
878880
function wrapped_func(cx, argc, argv) {
879881
var result;

0 commit comments

Comments
 (0)