2 files changed, 12 insertions, 0 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 0506b685..7c4ee23a 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -2566,6 +2566,15 @@ void Executor::executeInstruction(ExecutionState &state, KInstruction *ki) {
     // instructions.
     terminateStateOnExecError(state, "Unexpected ShuffleVector instruction");
     break;
+  case Instruction::AtomicRMW:
+    terminateStateOnExecError(state, "Unexpected Atomic instruction, should be "
+                                     "lowered by LowerAtomicInstructionPass");
+    break;
+  case Instruction::AtomicCmpXchg:
+    terminateStateOnExecError(state,
+                              "Unexpected AtomicCmpXchg instruction, should be "
+                              "lowered by LowerAtomicInstructionPass");
+    break;
   // Other instructions...
   // Unhandled
   default:
diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp
index 7b02c856..b025c888 100644
--- a/lib/Module/KModule.cpp
+++ b/lib/Module/KModule.cpp
@@ -224,6 +224,9 @@ void KModule::instrument(const Interpreter::ModuleOptions &opts) {
   // NOTE: Must come before division/overshift checks because those passes
   // don't know how to handle vector instructions.
   pm.add(createScalarizerPass());
+
+  // This pass will replace atomic instructions with non-atomic operations
+  pm.add(createLowerAtomicPass());
   if (opts.CheckDivZero) pm.add(new DivCheckPass());
   if (opts.CheckOvershift) pm.add(new OvershiftCheckPass());