Index: lib/CodeGen/InterferenceCache.h
===================================================================
--- lib/CodeGen/InterferenceCache.h
+++ lib/CodeGen/InterferenceCache.h
@@ -171,7 +171,7 @@
   class Cursor {
     Entry *CacheEntry;
     BlockInterference *Current;
-    static BlockInterference NoInterference;
+    BlockInterference NoInterference;
 
     void setEntry(Entry *E) {
       Current = nullptr;
Index: lib/CodeGen/InterferenceCache.cpp
===================================================================
--- lib/CodeGen/InterferenceCache.cpp
+++ lib/CodeGen/InterferenceCache.cpp
@@ -20,9 +20,6 @@
 
 #define DEBUG_TYPE "regalloc"
 
-// Static member used for null interference cursors.
-InterferenceCache::BlockInterference InterferenceCache::Cursor::NoInterference;
-
 // Initializes PhysRegEntries (instead of a SmallVector, PhysRegEntries is a
 // buffer of size NumPhysRegs to speed up alloc/clear for targets with large
 // reg files). Calloced memory is used for good form, and quites tools like