diff --git a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp
index 34f1256880621..263e3a93f0434 100644
--- a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp
+++ b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp
@@ -1399,9 +1399,13 @@ SPIRVValue *LLVMToSPIRV::transIntrinsicInst(IntrinsicInst *II,
     }
     return 0;
   }
+  // We can just ignore/drop some intrinsics, like optimizations hint.
+  case Intrinsic::invariant_start:
+  case Intrinsic::invariant_end:
+    return nullptr;
   default:
-    // LLVM intrinsic functions shouldn't get to SPIRV, because they
-    // would have no definition there.
+    // Other LLVM intrinsics shouldn't get to SPIRV, because they
+    // can't be represented in SPIRV or not implemented yet.
     BM->getErrorLog().checkError(false, SPIRVEC_InvalidFunctionCall,
                                  II->getCalledValue()->getName().str(), "",
                                  __FILE__, __LINE__);
diff --git a/llvm-spirv/test/llvm.invariant.ll b/llvm-spirv/test/llvm.invariant.ll
new file mode 100644
index 0000000000000..cc23ab2dc9b56
--- /dev/null
+++ b/llvm-spirv/test/llvm.invariant.ll
@@ -0,0 +1,32 @@
+; Make sure the translator doesn't crash if the input LLVM IR contains llvm.invariant.* intrinsics
+; RUN: llvm-as < %s -o %t.bc
+; RUN: llvm-spirv %t.bc -o %t.spv
+; RUN: spirv-val %t.spv
+; RUN: llvm-spirv -to-text %t.spv -o - | FileCheck %s
+
+; CHECK-NOT: FunctionParameter
+; CHECK-NOT: FunctionCall
+
+source_filename = "<stdin>"
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
+target triple = "spir64-unknown-linux-sycldevice"
+
+@WGSharedVar = internal addrspace(3) constant i64 0, align 8
+
+; Function Attrs: argmemonly nounwind
+declare {}* @llvm.invariant.start.p3i8(i64 immarg, i8 addrspace(3)* nocapture) #0
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.invariant.end.p3i8({}*, i64 immarg, i8 addrspace(3)* nocapture) #0
+
+define linkonce_odr dso_local spir_func void @func() {
+  store i64 2, i64 addrspace(3)* @WGSharedVar
+  %1 = bitcast i64 addrspace(3)* @WGSharedVar to i8 addrspace(3)*
+  %2 = call {}* @llvm.invariant.start.p3i8(i64 8, i8 addrspace(3)* %1)
+  call void @llvm.invariant.end.p3i8({}* %2, i64 8, i8 addrspace(3)* %1)
+  ret void
+}
+
+attributes #0 = { argmemonly nounwind }
+
+!spirv.ExecutionMode = !{}