Skip to content

Commit

Permalink
Revert "Merge snabbco#1242 branch 'lukego/jit-tracebarrier' into next"
Browse files Browse the repository at this point in the history
This reverts commit e8d0af7, reversing
changes made to cd29714.
  • Loading branch information
lukego committed Dec 5, 2017
1 parent 2d790f5 commit 2a33b5a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
6 changes: 0 additions & 6 deletions lib/luajit/src/lib_jit.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@ LJLIB_CF(jit_attach)
return 0;
}

/* Calling this forces a trace stitch. */
LJLIB_CF(jit_tracebarrier)
{
return 0;
}

LJLIB_PUSH(top-5) LJLIB_SET(os)
LJLIB_PUSH(top-4) LJLIB_SET(arch)
LJLIB_PUSH(top-3) LJLIB_SET(version_num)
Expand Down
2 changes: 0 additions & 2 deletions src/core/app.lua
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ end
-- Run app:methodname() in protected mode (pcall). If it throws an
-- error app will be marked as dead and restarted eventually.
function with_restart (app, method)
jit.tracebarrier() -- don't mix engine and apps in traces
local status, result
if use_restart then
-- Run fn in protected mode using pcall.
Expand All @@ -96,7 +95,6 @@ function with_restart (app, method)
else
status, result = true, method(app)
end
jit.tracebarrier()
return status, result
end

Expand Down

0 comments on commit 2a33b5a

Please sign in to comment.