Fix warnings in build on clang-x86_64-freebsd buildbot.

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

diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index 409df638c98fbcabca655289e55fd909ec637006..f04f9a3a3903265e09180e66a28e96c778e39add 100644 (file)
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -1011,7 +1011,7 @@ public:
     std::vector<char> buf;
     buf.reserve(strlen(FE->getName())+100);    
     
-    sprintf(&buf[0], "dev_%llx", (uint64_t) FE->getDevice());
+    sprintf(&buf[0], "dev_%llx", (unsigned long long) FE->getDevice());
     FName.appendComponent(&buf[0]);
     FName.createDirectoryOnDisk(true);
     if (!FName.canWrite() || !FName.isDirectory()) {
@@ -1019,7 +1019,8 @@ public:
       return;
     }
             
-    sprintf(&buf[0], "%s-%llX.ast", FE->getName(), (uint64_t) FE->getInode());
+    sprintf(&buf[0], "%s-%llX.ast", FE->getName(),
+            (unsigned long long) FE->getInode());
     FName.appendComponent(&buf[0]);    
     EmitASTBitcodeFile(&TU, FName);
     

diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp
index 52437e7772bdda078fcc7ba41e7891379fc5ab44..16efda8ecfa079bab3792b169ed2f522c794ff83 100644 (file)
--- a/lib/Driver/Arg.cpp
+++ b/lib/Driver/Arg.cpp
@@ -145,4 +145,5 @@ const char *JoinedAndSeparateArg::getValue(const ArgList &Args,
                                            unsigned N) const {
   assert(N < getNumValues() && "Invalid index.");
   assert(0 && "FIXME: Implement");
+  return 0;
 }

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 2a9fa0a85b58c22560d4935772cdcd03b5513ea6..e20b42ac6405f1bd400a522d0ef4f0d27d8efc15 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -440,7 +440,7 @@ static void DefineTypeSize(const char *MacroName, unsigned TypeWidth,
                            const char *ValSuffix, bool isSigned,
                            std::vector<char> &Buf) {
   char MacroBuf[60];
-  uint64_t MaxVal;
+  long long MaxVal;
   if (isSigned)
     MaxVal = (1LL << (TypeWidth - 1)) - 1;
   else