diff --git a/driver/main.cpp b/driver/main.cpp
index decbbf80..bf976ba6 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -638,6 +638,21 @@ static void registerPredefinedVersions() {
 
     registerPredefinedTargetVersions();
 
+#if LDC_LLVM_VER >= 303
+    // Pass sanitizer arguments to linker. Requires clang.
+    if (opts::sanitize == opts::AddressSanitizer) {
+        VersionCondition::addPredefinedGlobalIdent("LDC_AddressSanitizer");
+    }
+
+    if (opts::sanitize == opts::MemorySanitizer) {
+        VersionCondition::addPredefinedGlobalIdent("LDC_MemorySanitizer");
+    }
+
+    if (opts::sanitize == opts::ThreadSanitizer) {
+        VersionCondition::addPredefinedGlobalIdent("LDC_ThreadSanitizer");
+    }
+#endif
+
     // Expose LLVM version to runtime
 #define STR(x) #x
 #define XSTR(x) STR(x)
diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp
index 901f1dc2..f498ffa2 100644
--- a/gen/passes/GarbageCollect2Stack.cpp
+++ b/gen/passes/GarbageCollect2Stack.cpp
@@ -397,7 +397,11 @@ namespace {
 #endif
           AU.addRequired<DominatorTree>();
 
+#if LDC_LLVM_VER >= 305
+          AU.addPreserved<CallGraphWrapperPass>();
+#else
           AU.addPreserved<CallGraph>();
+#endif
         }
     };
     char GarbageCollect2Stack::ID = 0;
@@ -460,7 +464,11 @@ bool GarbageCollect2Stack::runOnFunction(Function &F) {
     TargetData& TD = getAnalysis<TargetData>();
 #endif
     DominatorTree& DT = getAnalysis<DominatorTree>();
+#if LDC_LLVM_VER >= 305
+    CallGraph* CG = &getAnalysisIfAvailable<CallGraphWrapperPass>()->getCallGraph();
+#else
     CallGraph* CG = getAnalysisIfAvailable<CallGraph>();
+#endif
     CallGraphNode* CGNode = CG ? (*CG)[&F] : NULL;
 
     Analysis A = { TD, *M, CG, CGNode };