maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use (void *)(intptr_t) to cast function addresses to void* 

for use with sys::Path::GetMainExecutable, to avoid warnings
with -pedantic.

llvm-svn: 78245
This commit is contained in:
Dan Gohman 2009-08-05 21:03:39 +00:00
parent e5b5d8fbb3
commit 198f5e84c6
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/tools/bugpoint/ToolRunner.cpp
View File

@ -232,8 +232,7 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const char *Argv0,
std::string &Message,
const std::vector<std::string> *ToolArgs) {
std::string LLIPath =
FindExecutable("lli", Argv0,
reinterpret_cast<void *>(&createLLI)).toString();
FindExecutable("lli", Argv0, (void *)(intptr_t)&createLLI).toString();
if (!LLIPath.empty()) {
Message = "Found lli: " + LLIPath + "\n";
return new LLI(LLIPath, ToolArgs);
@ -420,8 +419,7 @@ LLC *AbstractInterpreter::createLLC(const char *Argv0,
const std::vector<std::string> *Args,
const std::vector<std::string> *GCCArgs) {
std::string LLCPath =
FindExecutable("llc", Argv0,
reinterpret_cast<void *>(&createLLC)).toString();
FindExecutable("llc", Argv0, (void *)(intptr_t)&createLLC).toString();
if (LLCPath.empty()) {
Message = "Cannot find `llc' in executable directory or PATH!\n";
return 0;
@ -507,8 +505,7 @@ int JIT::ExecuteProgram(const std::string &Bitcode,
AbstractInterpreter *AbstractInterpreter::createJIT(const char *Argv0,
std::string &Message, const std::vector<std::string> *Args) {
std::string LLIPath =
FindExecutable("lli", Argv0,
reinterpret_cast<void *>(&createJIT)).toString();
FindExecutable("lli", Argv0, (void *)(intptr_t)&createJIT).toString();
if (!LLIPath.empty()) {
Message = "Found lli: " + LLIPath + "\n";
return new JIT(LLIPath, Args);
@ -587,8 +584,7 @@ CBE *AbstractInterpreter::createCBE(const char *Argv0,
const std::vector<std::string> *Args,
const std::vector<std::string> *GCCArgs) {
sys::Path LLCPath =
FindExecutable("llc", Argv0,
reinterpret_cast<void *>(&createCBE));
FindExecutable("llc", Argv0, (void *)(intptr_t)&createCBE);
if (LLCPath.isEmpty()) {
Message =
"Cannot find `llc' in executable directory or PATH!\n";

6
llvm/tools/llvm-ld/llvm-ld.cpp
View File

@ -415,7 +415,7 @@ static void EmitShellScript(char **argv) {
// build tree to the destination file.
std::string ErrMsg;
sys::Path llvmstub = FindExecutable("llvm-stub.exe", argv[0],
reinterpret_cast<void *>(&Optimize));
(void *)(intptr_t)&Optimize);
if (llvmstub.isEmpty())
PrintAndExit("Could not find llvm-stub.exe executable!");
@ -642,7 +642,7 @@ int main(int argc, char **argv, char **envp) {
// Determine the locations of the llc and gcc programs.
sys::Path llc = FindExecutable("llc", argv[0],
reinterpret_cast<void *>(&Optimize));
(void *)(intptr_t)&Optimize);
if (llc.isEmpty())
PrintAndExit("Failed to find llc");
@ -672,7 +672,7 @@ int main(int argc, char **argv, char **envp) {
// Determine the locations of the llc and gcc programs.
sys::Path llc = FindExecutable("llc", argv[0],
reinterpret_cast<void *>(&Optimize));
(void *)(intptr_t)&Optimize);
if (llc.isEmpty())
PrintAndExit("Failed to find llc");