10000 Merge pull request #35 from scala-wasm/wasm-string-faster-concat · sjrd/scala-js@3d97e56 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3d97e56

Browse files
authored
Merge pull request scala-js#35 from scala-wasm/wasm-string-faster-concat
Optimize string concatenation with new data structure
2 parents 62e8907 + 6ef588d commit 3d97e56

File tree

9 files changed

+331
-102
lines changed

9 files changed

+331
-102
lines changed

examples/test-suite-wasi/src/main/scala/test-suites-wasi/JavalibLangTest.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,8 @@ object JavalibLangTest {
536536

537537
trim()
538538

539-
// TODO: it takes too long to concat strings
540-
// createFromLargeCharArray_Issue2553()
541-
// createFromLargeCodePointArray_Issue2553()
539+
createFromLargeCharArray_Issue2553()
540+
createFromLargeCodePointArray_Issue2553()
542541

543542
stringCaseInsensitiveOrdering()
544543
}

linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/ClassEmitter.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
224224
val nameValue =
225225
if (targetPureWasm)
226226
ctx.stringPool.getConstantStringDataInstr(nameStr) :+
227-
wa.RefNull(watpe.HeapType(genTypeID.i16Array))
227+
wa.RefNull(watpe.HeapType(genTypeID.wasmString))
228228
else ctx.stringPool.getConstantStringDataInstr(nameStr)
229229

230230
val kind = className match {

0 commit comments

Comments
 (0)
0