diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-02-25 19:23:56 -0500 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-02-25 19:23:56 -0500 |
| commit | 230c0e80dfcd44870bec3254c399db430f6e1d98 (patch) | |
| tree | 745ec3b082adc222050b4d48a416d7a969dd148d /tools/test-js-optimizer-regs-output.js | |
| parent | 5a99d2567e76f257309cfd225876f3a5402e5f46 (diff) | |
| parent | 9d4ef477a511ae4136c2d63e0150a4768cbd53ea (diff) | |
Merge branch 'incoming'
Conflicts:
AUTHORS
Diffstat (limited to 'tools/test-js-optimizer-regs-output.js')
| -rw-r--r-- | tools/test-js-optimizer-regs-output.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/test-js-optimizer-regs-output.js b/tools/test-js-optimizer-regs-output.js index 36006b7c..fe7de5fb 100644 --- a/tools/test-js-optimizer-regs-output.js +++ b/tools/test-js-optimizer-regs-output.js @@ -225,4 +225,8 @@ function switchey(r1) { r9 = r1 + 2; pp(r9); } +function __ZN14NetworkAddressC1EPKcti(r1) { + __ZN14NetworkAddressC2EPKcti(r1); + return; +} |