Index: llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp
===================================================================
--- llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp
+++ llvm/trunk/tools/llvm-pdbdump/PdbYaml.cpp
@@ -311,7 +311,7 @@
             pdb::yaml::SerializationContext &Context) {
   IO.mapRequired("StartColumn", Obj.StartColumn);
   IO.mapRequired("EndColumn", Obj.EndColumn);
-};
+}
 
 void MappingContextTraits<pdb::yaml::PdbSourceLineBlock,
                           pdb::yaml::SerializationContext>::
@@ -320,7 +320,7 @@
   IO.mapRequired("FileName", Obj.FileName);
   IO.mapRequired("Lines", Obj.Lines, Context);
   IO.mapRequired("Columns", Obj.Columns, Context);
-};
+}
 
 void MappingContextTraits<pdb::yaml::PdbSourceFileChecksumEntry,
                           pdb::yaml::SerializationContext>::
@@ -329,7 +329,7 @@
   IO.mapRequired("FileName", Obj.FileName);
   IO.mapRequired("Kind", Obj.Kind);
   IO.mapRequired("Checksum", Obj.ChecksumBytes);
-};
+}
 
 void MappingContextTraits<pdb::yaml::PdbSourceLineInfo,
                           pdb::yaml::SerializationContext>::
@@ -340,7 +340,7 @@
   IO.mapRequired("RelocOffset", Obj.RelocOffset);
   IO.mapRequired("RelocSegment", Obj.RelocSegment);
   IO.mapRequired("LineInfo", Obj.LineInfo, Context);
-};
+}
 
 void MappingContextTraits<pdb::yaml::PdbSourceFileInfo,
                           pdb::yaml::SerializationContext>::
@@ -348,7 +348,7 @@
             pdb::yaml::SerializationContext &Context) {
   IO.mapOptionalWithContext("Lines", Obj.Lines, Context);
   IO.mapOptionalWithContext("Checksums", Obj.FileChecksums, Context);
-};
+}
 
 void MappingContextTraits<PdbTpiRecord, pdb::yaml::SerializationContext>::
     mapping(IO &IO, pdb::yaml::PdbTpiRecord &Obj,
Index: llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
===================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+++ llvm/trunk/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
@@ -23,8 +23,8 @@
 extern "C" PIPSQUEAK_EXPORT const char *TestA() { return "ProcessCall"; }
 
 std::string LibPath() {
-  std::string Path =
-      fs::getMainExecutable("DynamicLibraryTests", (void *)&TestA);
+  void *Ptr = (void*)(intptr_t)TestA;
+  std::string Path = fs::getMainExecutable("DynamicLibraryTests", Ptr);
   llvm::SmallString<256> Buf(path::parent_path(Path));
   path::append(Buf, "PipSqueak.so");
   return Buf.str();