Use std::list so that we have a stable iterator.

I will try to avoid creating these std::strings, but for now this gets
the tests passing with libc++.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182405 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Object/obj2yaml.test b/test/Object/obj2yaml.test
index c6011090851ef5d600d24d200cd9564f5378f02b..5c145e87d5d21bf5280a22aa210ec7059ef712ee 100644 (file)
--- a/test/Object/obj2yaml.test
+++ b/test/Object/obj2yaml.test
@@ -1,6 +1,5 @@
-RUN-disabled: obj2yaml %p/Inputs/trivial-object-test.coff-i386 | FileCheck %s --check-prefix COFF-I386
-RUN-disabled: obj2yaml %p/Inputs/trivial-object-test.coff-x86-64 | FileCheck %s --check-prefix COFF-X86-64
-RUN: true
+RUN: obj2yaml %p/Inputs/trivial-object-test.coff-i386 | FileCheck %s --check-prefix COFF-I386
+RUN: obj2yaml %p/Inputs/trivial-object-test.coff-x86-64 | FileCheck %s --check-prefix COFF-X86-64
 
 
 COFF-I386: header:

diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp
index 2a70cec09d9aacce77ecfbb799e79f371235a0b1..0bb3e24c3cad375c5b14a60abe316404ee8302c3 100644 (file)
--- a/tools/obj2yaml/coff2yaml.cpp
+++ b/tools/obj2yaml/coff2yaml.cpp
@@ -13,6 +13,8 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/YAMLTraits.h"
 
+#include <list>
+
 using namespace llvm;
 
 namespace {
@@ -24,7 +26,7 @@ class COFFDumper {
   void dumpSections(unsigned numSections);
   void dumpSymbols(unsigned numSymbols);
   StringRef getHexString(ArrayRef<uint8_t> Data);
-  std::vector<std::string> Strings;
+  std::list<std::string> Strings;
 
 public:
   COFFDumper(const object::COFFObjectFile &Obj);