1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
index 59a84e6f2d7b..70777f07fc6c 100644
--- a/llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/ErlangGCPrinter.cpp
@@ -14,10 +14,9 @@
 
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/AsmPrinter.h"
-#include "llvm/CodeGen/BuiltinGCs.h"
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
-#include "llvm/CodeGen/GCStrategy.h"
+#include "llvm/IR/BuiltinGCs.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"
@@ -79,11 +78,10 @@ void ErlangGCPrinter::finishAssembly(Module &M, GCModuleInfo &Info,
     AP.emitInt16(MD.size());
 
     // And each safe point...
-    for (GCFunctionInfo::iterator PI = MD.begin(), PE = MD.end(); PI != PE;
-         ++PI) {
+    for (const GCPoint &P : MD) {
       // Emit the address of the safe point.
       OS.AddComment("safe point address");
-      MCSymbol *Label = PI->Label;
+      MCSymbol *Label = P.Label;
       AP.emitLabelPlusOffset(Label /*Hi*/, 0 /*Offset*/, 4 /*Size*/);
     }