WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 3367dd57 authored by qinsoon's avatar qinsoon
Browse files

fix broken merge

parent f6da0a00
...@@ -674,6 +674,7 @@ pub fn estimate_insts_for_ir(inst: &Instruction) -> usize { ...@@ -674,6 +674,7 @@ pub fn estimate_insts_for_ir(inst: &Instruction) -> usize {
CurrentStack => 10, CurrentStack => 10,
KillStack(_) => 10, KillStack(_) => 10,
Throw(_) => 10, Throw(_) => 10,
SwapStackExpr { .. } | SwapStackExc { .. } | SwapStackKill { .. } => 10,
CommonInst_GetThreadLocal | CommonInst_SetThreadLocal(_) => 10, CommonInst_GetThreadLocal | CommonInst_SetThreadLocal(_) => 10,
CommonInst_Pin(_) | CommonInst_Unpin(_) => 10, CommonInst_Pin(_) | CommonInst_Unpin(_) => 10,
......
...@@ -307,6 +307,7 @@ fn dfs(cur: MuID, stack: &mut Vec<MuID>, visited: &mut Vec<MuID>, func: &mut MuF ...@@ -307,6 +307,7 @@ fn dfs(cur: MuID, stack: &mut Vec<MuID>, visited: &mut Vec<MuID>, func: &mut MuF
// call // call
Call { ref resume, .. } | Call { ref resume, .. } |
CCall { ref resume, .. } | CCall { ref resume, .. } |
SwapStackExc { ref resume, .. } |
ExnInstruction { ref resume, .. } => { ExnInstruction { ref resume, .. } => {
let ref normal = resume.normal_dest; let ref normal = resume.normal_dest;
let ref exn = resume.exn_dest; let ref exn = resume.exn_dest;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment