[llvm-commits] [PATCH] Move function prototype attribute inference to instcombine
Duncan Sands
baldrick at free.fr
Thu Nov 29 22:16:43 PST 2012
Hi Meador,
On 30/11/12 06:22, Meador Inge wrote:
> The simplify-libcalls pass implemented a doInitialization hook to infer
> function prototype attributes for well-known functions. Now that library
> call simplification is being carried out in instcombine it makes sense to
> move the attribute inference there as well.
I'm not a big fan of doInitialization personally. Couldn't you do it lazily
the first time that they are needed instead?
Ciao, Duncan.
>
> OK?
>
> ---
> lib/Transforms/InstCombine/InstCombine.h | 10 +-
> .../InstCombine/InstructionCombining.cpp | 699 +++++++++++++++++++
> lib/Transforms/Scalar/SimplifyLibCalls.cpp | 701 --------------------
> .../InstCombine/2009-02-11-NotInitialized.ll | 14 +
> test/Transforms/InstCombine/annotate-1.ll | 15 +
> test/Transforms/InstCombine/strto-1.ll | 14 +-
> .../SimplifyLibCalls/2009-01-04-Annotate.ll | 12 -
> .../SimplifyLibCalls/2009-02-11-NotInitialized.ll | 13 -
> 8 files changed, 744 insertions(+), 734 deletions(-)
> create mode 100644 test/Transforms/InstCombine/2009-02-11-NotInitialized.ll
> create mode 100644 test/Transforms/InstCombine/annotate-1.ll
> delete mode 100644 test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
> delete mode 100644 test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
>
> diff --git a/lib/Transforms/InstCombine/InstCombine.h b/lib/Transforms/InstCombine/InstCombine.h
> index 90637a9..66211f2 100644
> --- a/lib/Transforms/InstCombine/InstCombine.h
> +++ b/lib/Transforms/InstCombine/InstCombine.h
> @@ -92,7 +92,8 @@ public:
>
> public:
> virtual bool runOnFunction(Function &F);
> -
> + virtual bool doInitialization(Module &M);
> +
> bool DoOneIteration(Function &F, unsigned ItNum);
>
> virtual void getAnalysisUsage(AnalysisUsage &AU) const;
> @@ -371,6 +372,13 @@ private:
> /// Descale - Return a value X such that Val = X * Scale, or null if none. If
> /// the multiplication is known not to overflow then NoSignedWrap is set.
> Value *Descale(Value *Val, APInt Scale, bool &NoSignedWrap);
> +
> + void setDoesNotAccessMemory(Function &F);
> + void setOnlyReadsMemory(Function &F);
> + void setDoesNotThrow(Function &F);
> + void setDoesNotCapture(Function &F, unsigned n);
> + void setDoesNotAlias(Function &F, unsigned n);
> + void inferPrototypeAttributes(Function &F);
> };
>
>
> diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
> index feef2cc..4531e19 100644
> --- a/lib/Transforms/InstCombine/InstructionCombining.cpp
> +++ b/lib/Transforms/InstCombine/InstructionCombining.cpp
> @@ -65,6 +65,7 @@ STATISTIC(NumSunkInst , "Number of instructions sunk");
> STATISTIC(NumExpand, "Number of expansions");
> STATISTIC(NumFactor , "Number of factorizations");
> STATISTIC(NumReassoc , "Number of reassociations");
> +STATISTIC(NumAnnotated, "Number of attributes added to library functions");
>
> static cl::opt<bool> UnsafeFPShrink("enable-double-float-shrink", cl::Hidden,
> cl::init(false),
> @@ -2424,3 +2425,701 @@ bool InstCombiner::runOnFunction(Function &F) {
> FunctionPass *llvm::createInstructionCombiningPass() {
> return new InstCombiner();
> }
> +
> +// Utility methods used during prototype attribute inference to
> +// set function attributes and maintain statistics on the number
> +// of annotations made.
> +
> +void InstCombiner::setDoesNotAccessMemory(Function &F) {
> + if (!F.doesNotAccessMemory()) {
> + F.setDoesNotAccessMemory();
> + ++NumAnnotated;
> + MadeIRChange = true;
> + }
> +}
> +
> +void InstCombiner::setOnlyReadsMemory(Function &F) {
> + if (!F.onlyReadsMemory()) {
> + F.setOnlyReadsMemory();
> + ++NumAnnotated;
> + MadeIRChange = true;
> + }
> +}
> +
> +void InstCombiner::setDoesNotThrow(Function &F) {
> + if (!F.doesNotThrow()) {
> + F.setDoesNotThrow();
> + ++NumAnnotated;
> + MadeIRChange = true;
> + }
> +}
> +
> +void InstCombiner::setDoesNotCapture(Function &F, unsigned n) {
> + if (!F.doesNotCapture(n)) {
> + F.setDoesNotCapture(n);
> + ++NumAnnotated;
> + MadeIRChange = true;
> + }
> +}
> +
> +void InstCombiner::setDoesNotAlias(Function &F, unsigned n) {
> + if (!F.doesNotAlias(n)) {
> + F.setDoesNotAlias(n);
> + ++NumAnnotated;
> + MadeIRChange = true;
> + }
> +}
> +
> +/// inferPrototypeAttributes - Analyze the name and prototype of the
> +/// given function and set any applicable attributes.
> +void InstCombiner::inferPrototypeAttributes(Function &F) {
> + FunctionType *FTy = F.getFunctionType();
> +
> + StringRef Name = F.getName();
> + switch (Name[0]) {
> + case 's':
> + if (Name == "strlen") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "strchr" ||
> + Name == "strrchr") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isIntegerTy())
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + } else if (Name == "strcpy" ||
> + Name == "stpcpy" ||
> + Name == "strcat" ||
> + Name == "strtol" ||
> + Name == "strtod" ||
> + Name == "strtof" ||
> + Name == "strtoul" ||
> + Name == "strtoll" ||
> + Name == "strtold" ||
> + Name == "strncat" ||
> + Name == "strncpy" ||
> + Name == "stpncpy" ||
> + Name == "strtoull") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "strxfrm") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "strcmp" ||
> + Name == "strspn" ||
> + Name == "strncmp" ||
> + Name == "strcspn" ||
> + Name == "strcoll" ||
> + Name == "strcasecmp" ||
> + Name == "strncasecmp") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "strstr" ||
> + Name == "strpbrk") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "strtok" ||
> + Name == "strtok_r") {
> + if (FTy->getNumParams() < 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "scanf" ||
> + Name == "setbuf" ||
> + Name == "setvbuf") {
> + if (FTy->getNumParams() < 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "strdup" ||
> + Name == "strndup") {
> + if (FTy->getNumParams() < 1 || !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "stat" ||
> + Name == "sscanf" ||
> + Name == "sprintf" ||
> + Name == "statvfs") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "snprintf") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(2)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 3);
> + } else if (Name == "setitimer") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(1)->isPointerTy() ||
> + !FTy->getParamType(2)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + setDoesNotCapture(F, 3);
> + } else if (Name == "system") {
> + if (FTy->getNumParams() != 1 ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + // May throw; "system" is a valid pthread cancellation point.
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'm':
> + if (Name == "malloc") {
> + if (FTy->getNumParams() != 1 ||
> + !FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + } else if (Name == "memcmp") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "memchr" ||
> + Name == "memrchr") {
> + if (FTy->getNumParams() != 3)
> + return;
> + setOnlyReadsMemory(F);
> + setDoesNotThrow(F);
> + } else if (Name == "modf" ||
> + Name == "modff" ||
> + Name == "modfl" ||
> + Name == "memcpy" ||
> + Name == "memccpy" ||
> + Name == "memmove") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "memalign") {
> + if (!FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotAlias(F, 0);
> + } else if (Name == "mkdir" ||
> + Name == "mktime") {
> + if (FTy->getNumParams() == 0 ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'r':
> + if (Name == "realloc") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "read") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + // May throw; "read" is a valid pthread cancellation point.
> + setDoesNotCapture(F, 2);
> + } else if (Name == "rmdir" ||
> + Name == "rewind" ||
> + Name == "remove" ||
> + Name == "realpath") {
> + if (FTy->getNumParams() < 1 ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "rename" ||
> + Name == "readlink") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + }
> + break;
> + case 'w':
> + if (Name == "write") {
> + if (FTy->getNumParams() != 3 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + // May throw; "write" is a valid pthread cancellation point.
> + setDoesNotCapture(F, 2);
> + }
> + break;
> + case 'b':
> + if (Name == "bcopy") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "bcmp") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setOnlyReadsMemory(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "bzero") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'c':
> + if (Name == "calloc") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + } else if (Name == "chmod" ||
> + Name == "chown" ||
> + Name == "ctermid" ||
> + Name == "clearerr" ||
> + Name == "closedir") {
> + if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'a':
> + if (Name == "atoi" ||
> + Name == "atol" ||
> + Name == "atof" ||
> + Name == "atoll") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setOnlyReadsMemory(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "access") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'f':
> + if (Name == "fopen") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "fdopen") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "feof" ||
> + Name == "free" ||
> + Name == "fseek" ||
> + Name == "ftell" ||
> + Name == "fgetc" ||
> + Name == "fseeko" ||
> + Name == "ftello" ||
> + Name == "fileno" ||
> + Name == "fflush" ||
> + Name == "fclose" ||
> + Name == "fsetpos" ||
> + Name == "flockfile" ||
> + Name == "funlockfile" ||
> + Name == "ftrylockfile") {
> + if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "ferror") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setOnlyReadsMemory(F);
> + } else if (Name == "fputc" ||
> + Name == "fstat" ||
> + Name == "frexp" ||
> + Name == "frexpf" ||
> + Name == "frexpl" ||
> + Name == "fstatvfs") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "fgets") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(2)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 3);
> + } else if (Name == "fread" ||
> + Name == "fwrite") {
> + if (FTy->getNumParams() != 4 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(3)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 4);
> + } else if (Name == "fputs" ||
> + Name == "fscanf" ||
> + Name == "fprintf" ||
> + Name == "fgetpos") {
> + if (FTy->getNumParams() < 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + }
> + break;
> + case 'g':
> + if (Name == "getc" ||
> + Name == "getlogin_r" ||
> + Name == "getc_unlocked") {
> + if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "getenv") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setOnlyReadsMemory(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "gets" ||
> + Name == "getchar") {
> + setDoesNotThrow(F);
> + } else if (Name == "getitimer") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "getpwnam") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'u':
> + if (Name == "ungetc") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "uname" ||
> + Name == "unlink" ||
> + Name == "unsetenv") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "utime" ||
> + Name == "utimes") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + }
> + break;
> + case 'p':
> + if (Name == "putc") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "puts" ||
> + Name == "printf" ||
> + Name == "perror") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "pread" ||
> + Name == "pwrite") {
> + if (FTy->getNumParams() != 4 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + // May throw; these are valid pthread cancellation points.
> + setDoesNotCapture(F, 2);
> + } else if (Name == "putchar") {
> + setDoesNotThrow(F);
> + } else if (Name == "popen") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "pclose") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'v':
> + if (Name == "vscanf") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "vsscanf" ||
> + Name == "vfscanf") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(1)->isPointerTy() ||
> + !FTy->getParamType(2)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "valloc") {
> + if (!FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + } else if (Name == "vprintf") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "vfprintf" ||
> + Name == "vsprintf") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "vsnprintf") {
> + if (FTy->getNumParams() != 4 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(2)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 3);
> + }
> + break;
> + case 'o':
> + if (Name == "open") {
> + if (FTy->getNumParams() < 2 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + // May throw; "open" is a valid pthread cancellation point.
> + setDoesNotCapture(F, 1);
> + } else if (Name == "opendir") {
> + if (FTy->getNumParams() != 1 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 't':
> + if (Name == "tmpfile") {
> + if (!FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + } else if (Name == "times") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'h':
> + if (Name == "htonl" ||
> + Name == "htons") {
> + setDoesNotThrow(F);
> + setDoesNotAccessMemory(F);
> + }
> + break;
> + case 'n':
> + if (Name == "ntohl" ||
> + Name == "ntohs") {
> + setDoesNotThrow(F);
> + setDoesNotAccessMemory(F);
> + }
> + break;
> + case 'l':
> + if (Name == "lstat") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "lchown") {
> + if (FTy->getNumParams() != 3 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + case 'q':
> + if (Name == "qsort") {
> + if (FTy->getNumParams() != 4 || !FTy->getParamType(3)->isPointerTy())
> + return;
> + // May throw; places call through function pointer.
> + setDoesNotCapture(F, 4);
> + }
> + break;
> + case '_':
> + if (Name == "__strdup" ||
> + Name == "__strndup") {
> + if (FTy->getNumParams() < 1 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "__strtok_r") {
> + if (FTy->getNumParams() != 3 ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "_IO_getc") {
> + if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "_IO_putc") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + }
> + break;
> + case 1:
> + if (Name == "\1__isoc99_scanf") {
> + if (FTy->getNumParams() < 1 ||
> + !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "\1stat64" ||
> + Name == "\1lstat64" ||
> + Name == "\1statvfs64" ||
> + Name == "\1__isoc99_sscanf") {
> + if (FTy->getNumParams() < 1 ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "\1fopen64") {
> + if (FTy->getNumParams() != 2 ||
> + !FTy->getReturnType()->isPointerTy() ||
> + !FTy->getParamType(0)->isPointerTy() ||
> + !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + setDoesNotCapture(F, 1);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "\1fseeko64" ||
> + Name == "\1ftello64") {
> + if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 1);
> + } else if (Name == "\1tmpfile64") {
> + if (!FTy->getReturnType()->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotAlias(F, 0);
> + } else if (Name == "\1fstat64" ||
> + Name == "\1fstatvfs64") {
> + if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> + return;
> + setDoesNotThrow(F);
> + setDoesNotCapture(F, 2);
> + } else if (Name == "\1open64") {
> + if (FTy->getNumParams() < 2 || !FTy->getParamType(0)->isPointerTy())
> + return;
> + // May throw; "open" is a valid pthread cancellation point.
> + setDoesNotCapture(F, 1);
> + }
> + break;
> + }
> +}
> +
> +/// doInitialization - Add attributes to well-known functions.
> +///
> +bool InstCombiner::doInitialization(Module &M) {
> + MadeIRChange = false;
> + for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
> + Function &F = *I;
> + if (F.isDeclaration() && F.hasName())
> + inferPrototypeAttributes(F);
> + }
> + return MadeIRChange;
> +}
> diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
> index 0d3a2e0..2344bcb 100644
> --- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp
> +++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
> @@ -24,7 +24,6 @@
> #include "llvm/Pass.h"
> #include "llvm/ADT/STLExtras.h"
> #include "llvm/ADT/SmallPtrSet.h"
> -#include "llvm/ADT/Statistic.h"
> #include "llvm/ADT/StringMap.h"
> #include "llvm/Analysis/ValueTracking.h"
> #include "llvm/Support/CommandLine.h"
> @@ -35,7 +34,6 @@
> #include "llvm/Config/config.h" // FIXME: Shouldn't depend on host!
> using namespace llvm;
>
> -STATISTIC(NumAnnotated, "Number of attributes added to library functions");
>
> //===----------------------------------------------------------------------===//
> // Optimizer Base Class
> @@ -104,14 +102,6 @@ namespace {
> void InitOptimizations();
> bool runOnFunction(Function &F);
>
> - void setDoesNotAccessMemory(Function &F);
> - void setOnlyReadsMemory(Function &F);
> - void setDoesNotThrow(Function &F);
> - void setDoesNotCapture(Function &F, unsigned n);
> - void setDoesNotAlias(Function &F, unsigned n);
> - bool doInitialization(Module &M);
> -
> - void inferPrototypeAttributes(Function &F);
> virtual void getAnalysisUsage(AnalysisUsage &AU) const {
> AU.addRequired<TargetLibraryInfo>();
> }
> @@ -208,697 +198,6 @@ bool SimplifyLibCalls::runOnFunction(Function &F) {
> return Changed;
> }
>
> -// Utility methods for doInitialization.
> -
> -void SimplifyLibCalls::setDoesNotAccessMemory(Function &F) {
> - if (!F.doesNotAccessMemory()) {
> - F.setDoesNotAccessMemory();
> - ++NumAnnotated;
> - Modified = true;
> - }
> -}
> -void SimplifyLibCalls::setOnlyReadsMemory(Function &F) {
> - if (!F.onlyReadsMemory()) {
> - F.setOnlyReadsMemory();
> - ++NumAnnotated;
> - Modified = true;
> - }
> -}
> -void SimplifyLibCalls::setDoesNotThrow(Function &F) {
> - if (!F.doesNotThrow()) {
> - F.setDoesNotThrow();
> - ++NumAnnotated;
> - Modified = true;
> - }
> -}
> -void SimplifyLibCalls::setDoesNotCapture(Function &F, unsigned n) {
> - if (!F.doesNotCapture(n)) {
> - F.setDoesNotCapture(n);
> - ++NumAnnotated;
> - Modified = true;
> - }
> -}
> -void SimplifyLibCalls::setDoesNotAlias(Function &F, unsigned n) {
> - if (!F.doesNotAlias(n)) {
> - F.setDoesNotAlias(n);
> - ++NumAnnotated;
> - Modified = true;
> - }
> -}
> -
> -
> -void SimplifyLibCalls::inferPrototypeAttributes(Function &F) {
> - FunctionType *FTy = F.getFunctionType();
> -
> - StringRef Name = F.getName();
> - switch (Name[0]) {
> - case 's':
> - if (Name == "strlen") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "strchr" ||
> - Name == "strrchr") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isIntegerTy())
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - } else if (Name == "strcpy" ||
> - Name == "stpcpy" ||
> - Name == "strcat" ||
> - Name == "strtol" ||
> - Name == "strtod" ||
> - Name == "strtof" ||
> - Name == "strtoul" ||
> - Name == "strtoll" ||
> - Name == "strtold" ||
> - Name == "strncat" ||
> - Name == "strncpy" ||
> - Name == "stpncpy" ||
> - Name == "strtoull") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "strxfrm") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "strcmp" ||
> - Name == "strspn" ||
> - Name == "strncmp" ||
> - Name == "strcspn" ||
> - Name == "strcoll" ||
> - Name == "strcasecmp" ||
> - Name == "strncasecmp") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "strstr" ||
> - Name == "strpbrk") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "strtok" ||
> - Name == "strtok_r") {
> - if (FTy->getNumParams() < 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "scanf" ||
> - Name == "setbuf" ||
> - Name == "setvbuf") {
> - if (FTy->getNumParams() < 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "strdup" ||
> - Name == "strndup") {
> - if (FTy->getNumParams() < 1 || !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "stat" ||
> - Name == "sscanf" ||
> - Name == "sprintf" ||
> - Name == "statvfs") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "snprintf") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(2)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 3);
> - } else if (Name == "setitimer") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(1)->isPointerTy() ||
> - !FTy->getParamType(2)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - setDoesNotCapture(F, 3);
> - } else if (Name == "system") {
> - if (FTy->getNumParams() != 1 ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - // May throw; "system" is a valid pthread cancellation point.
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'm':
> - if (Name == "malloc") {
> - if (FTy->getNumParams() != 1 ||
> - !FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - } else if (Name == "memcmp") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "memchr" ||
> - Name == "memrchr") {
> - if (FTy->getNumParams() != 3)
> - return;
> - setOnlyReadsMemory(F);
> - setDoesNotThrow(F);
> - } else if (Name == "modf" ||
> - Name == "modff" ||
> - Name == "modfl" ||
> - Name == "memcpy" ||
> - Name == "memccpy" ||
> - Name == "memmove") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "memalign") {
> - if (!FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotAlias(F, 0);
> - } else if (Name == "mkdir" ||
> - Name == "mktime") {
> - if (FTy->getNumParams() == 0 ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'r':
> - if (Name == "realloc") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "read") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - // May throw; "read" is a valid pthread cancellation point.
> - setDoesNotCapture(F, 2);
> - } else if (Name == "rmdir" ||
> - Name == "rewind" ||
> - Name == "remove" ||
> - Name == "realpath") {
> - if (FTy->getNumParams() < 1 ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "rename" ||
> - Name == "readlink") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - }
> - break;
> - case 'w':
> - if (Name == "write") {
> - if (FTy->getNumParams() != 3 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - // May throw; "write" is a valid pthread cancellation point.
> - setDoesNotCapture(F, 2);
> - }
> - break;
> - case 'b':
> - if (Name == "bcopy") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "bcmp") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setOnlyReadsMemory(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "bzero") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'c':
> - if (Name == "calloc") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - } else if (Name == "chmod" ||
> - Name == "chown" ||
> - Name == "ctermid" ||
> - Name == "clearerr" ||
> - Name == "closedir") {
> - if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'a':
> - if (Name == "atoi" ||
> - Name == "atol" ||
> - Name == "atof" ||
> - Name == "atoll") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setOnlyReadsMemory(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "access") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'f':
> - if (Name == "fopen") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "fdopen") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "feof" ||
> - Name == "free" ||
> - Name == "fseek" ||
> - Name == "ftell" ||
> - Name == "fgetc" ||
> - Name == "fseeko" ||
> - Name == "ftello" ||
> - Name == "fileno" ||
> - Name == "fflush" ||
> - Name == "fclose" ||
> - Name == "fsetpos" ||
> - Name == "flockfile" ||
> - Name == "funlockfile" ||
> - Name == "ftrylockfile") {
> - if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "ferror") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setOnlyReadsMemory(F);
> - } else if (Name == "fputc" ||
> - Name == "fstat" ||
> - Name == "frexp" ||
> - Name == "frexpf" ||
> - Name == "frexpl" ||
> - Name == "fstatvfs") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "fgets") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(2)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 3);
> - } else if (Name == "fread" ||
> - Name == "fwrite") {
> - if (FTy->getNumParams() != 4 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(3)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 4);
> - } else if (Name == "fputs" ||
> - Name == "fscanf" ||
> - Name == "fprintf" ||
> - Name == "fgetpos") {
> - if (FTy->getNumParams() < 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - }
> - break;
> - case 'g':
> - if (Name == "getc" ||
> - Name == "getlogin_r" ||
> - Name == "getc_unlocked") {
> - if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "getenv") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setOnlyReadsMemory(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "gets" ||
> - Name == "getchar") {
> - setDoesNotThrow(F);
> - } else if (Name == "getitimer") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "getpwnam") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'u':
> - if (Name == "ungetc") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "uname" ||
> - Name == "unlink" ||
> - Name == "unsetenv") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "utime" ||
> - Name == "utimes") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - }
> - break;
> - case 'p':
> - if (Name == "putc") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "puts" ||
> - Name == "printf" ||
> - Name == "perror") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "pread" ||
> - Name == "pwrite") {
> - if (FTy->getNumParams() != 4 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - // May throw; these are valid pthread cancellation points.
> - setDoesNotCapture(F, 2);
> - } else if (Name == "putchar") {
> - setDoesNotThrow(F);
> - } else if (Name == "popen") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "pclose") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'v':
> - if (Name == "vscanf") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "vsscanf" ||
> - Name == "vfscanf") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(1)->isPointerTy() ||
> - !FTy->getParamType(2)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "valloc") {
> - if (!FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - } else if (Name == "vprintf") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "vfprintf" ||
> - Name == "vsprintf") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "vsnprintf") {
> - if (FTy->getNumParams() != 4 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(2)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 3);
> - }
> - break;
> - case 'o':
> - if (Name == "open") {
> - if (FTy->getNumParams() < 2 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - // May throw; "open" is a valid pthread cancellation point.
> - setDoesNotCapture(F, 1);
> - } else if (Name == "opendir") {
> - if (FTy->getNumParams() != 1 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 't':
> - if (Name == "tmpfile") {
> - if (!FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - } else if (Name == "times") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'h':
> - if (Name == "htonl" ||
> - Name == "htons") {
> - setDoesNotThrow(F);
> - setDoesNotAccessMemory(F);
> - }
> - break;
> - case 'n':
> - if (Name == "ntohl" ||
> - Name == "ntohs") {
> - setDoesNotThrow(F);
> - setDoesNotAccessMemory(F);
> - }
> - break;
> - case 'l':
> - if (Name == "lstat") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "lchown") {
> - if (FTy->getNumParams() != 3 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - case 'q':
> - if (Name == "qsort") {
> - if (FTy->getNumParams() != 4 || !FTy->getParamType(3)->isPointerTy())
> - return;
> - // May throw; places call through function pointer.
> - setDoesNotCapture(F, 4);
> - }
> - break;
> - case '_':
> - if (Name == "__strdup" ||
> - Name == "__strndup") {
> - if (FTy->getNumParams() < 1 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "__strtok_r") {
> - if (FTy->getNumParams() != 3 ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "_IO_getc") {
> - if (FTy->getNumParams() != 1 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "_IO_putc") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - }
> - break;
> - case 1:
> - if (Name == "\1__isoc99_scanf") {
> - if (FTy->getNumParams() < 1 ||
> - !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "\1stat64" ||
> - Name == "\1lstat64" ||
> - Name == "\1statvfs64" ||
> - Name == "\1__isoc99_sscanf") {
> - if (FTy->getNumParams() < 1 ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "\1fopen64") {
> - if (FTy->getNumParams() != 2 ||
> - !FTy->getReturnType()->isPointerTy() ||
> - !FTy->getParamType(0)->isPointerTy() ||
> - !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - setDoesNotCapture(F, 1);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "\1fseeko64" ||
> - Name == "\1ftello64") {
> - if (FTy->getNumParams() == 0 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 1);
> - } else if (Name == "\1tmpfile64") {
> - if (!FTy->getReturnType()->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotAlias(F, 0);
> - } else if (Name == "\1fstat64" ||
> - Name == "\1fstatvfs64") {
> - if (FTy->getNumParams() != 2 || !FTy->getParamType(1)->isPointerTy())
> - return;
> - setDoesNotThrow(F);
> - setDoesNotCapture(F, 2);
> - } else if (Name == "\1open64") {
> - if (FTy->getNumParams() < 2 || !FTy->getParamType(0)->isPointerTy())
> - return;
> - // May throw; "open" is a valid pthread cancellation point.
> - setDoesNotCapture(F, 1);
> - }
> - break;
> - }
> -}
> -
> -/// doInitialization - Add attributes to well-known functions.
> -///
> -bool SimplifyLibCalls::doInitialization(Module &M) {
> - Modified = false;
> - for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) {
> - Function &F = *I;
> - if (F.isDeclaration() && F.hasName())
> - inferPrototypeAttributes(F);
> - }
> - return Modified;
> -}
> -
> // TODO:
> // Additional cases that we need to add to this file:
> //
> diff --git a/test/Transforms/InstCombine/2009-02-11-NotInitialized.ll b/test/Transforms/InstCombine/2009-02-11-NotInitialized.ll
> new file mode 100644
> index 0000000..b66495d
> --- /dev/null
> +++ b/test/Transforms/InstCombine/2009-02-11-NotInitialized.ll
> @@ -0,0 +1,14 @@
> +; RUN: opt < %s -inline -instcombine -functionattrs | llvm-dis
> +;
> +; Check that nocapture attributes are added when run after an SCC pass.
> +; PR3520
> +
> +define i32 @use(i8* %x) nounwind readonly {
> +; CHECK: @use(i8* nocapture %x)
> + %1 = tail call i64 @strlen(i8* %x) nounwind readonly
> + %2 = trunc i64 %1 to i32
> + ret i32 %2
> +}
> +
> +declare i64 @strlen(i8*) nounwind readonly
> +; CHECK: declare i64 @strlen(i8* nocapture) nounwind readonly
> diff --git a/test/Transforms/InstCombine/annotate-1.ll b/test/Transforms/InstCombine/annotate-1.ll
> new file mode 100644
> index 0000000..1f017bc
> --- /dev/null
> +++ b/test/Transforms/InstCombine/annotate-1.ll
> @@ -0,0 +1,15 @@
> +; RUN: opt < %s -instcombine -S | FileCheck %s
> +
> +declare i8* @fopen(i8*, i8*)
> +; CHECK: declare noalias i8* @fopen(i8* nocapture, i8* nocapture) nounwind
> +
> +declare i8 @strlen(i8*)
> +; CHECK: declare i8 @strlen(i8* nocapture) nounwind readonly
> +
> +declare i32* @realloc(i32*, i32)
> +; CHECK: declare noalias i32* @realloc(i32* nocapture, i32) nounwind
> +
> +; Test deliberately wrong declaration
> +
> +declare i32 @strcpy(...)
> +; CHECK: declare i32 @strcpy(...)
> diff --git a/test/Transforms/InstCombine/strto-1.ll b/test/Transforms/InstCombine/strto-1.ll
> index 16c0c67..3dacf24 100644
> --- a/test/Transforms/InstCombine/strto-1.ll
> +++ b/test/Transforms/InstCombine/strto-1.ll
> @@ -5,25 +5,25 @@
> target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
>
> declare i64 @strtol(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare i64 @strtol(i8*, i8**, i32)
> +; CHECK: declare i64 @strtol(i8*, i8** nocapture, i32)
>
> declare double @strtod(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare double @strtod(i8*, i8**, i32)
> +; CHECK: declare double @strtod(i8*, i8** nocapture, i32)
>
> declare float @strtof(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare float @strtof(i8*, i8**, i32)
> +; CHECK: declare float @strtof(i8*, i8** nocapture, i32)
>
> declare i64 @strtoul(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare i64 @strtoul(i8*, i8**, i32)
> +; CHECK: declare i64 @strtoul(i8*, i8** nocapture, i32)
>
> declare i64 @strtoll(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare i64 @strtoll(i8*, i8**, i32)
> +; CHECK: declare i64 @strtoll(i8*, i8** nocapture, i32)
>
> declare double @strtold(i8* %s, i8** %endptr)
> -; CHECK: declare double @strtold(i8*, i8**)
> +; CHECK: declare double @strtold(i8*, i8** nocapture)
>
> declare i64 @strtoull(i8* %s, i8** %endptr, i32 %base)
> -; CHECK: declare i64 @strtoull(i8*, i8**, i32)
> +; CHECK: declare i64 @strtoull(i8*, i8** nocapture, i32)
>
> define void @test_simplify1(i8* %x, i8** %endptr) {
> ; CHECK: @test_simplify1
> diff --git a/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll b/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
> deleted file mode 100644
> index 73eb05b..0000000
> --- a/test/Transforms/SimplifyLibCalls/2009-01-04-Annotate.ll
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -; RUN: opt < %s -simplify-libcalls -S > %t
> -; RUN: grep noalias %t | count 2
> -; RUN: grep nocapture %t | count 3
> -; RUN: grep nounwind %t | count 3
> -; RUN: grep readonly %t | count 1
> -
> -declare i8* @fopen(i8*, i8*)
> -declare i8 @strlen(i8*)
> -declare i32* @realloc(i32*, i32)
> -
> -; Test deliberately wrong declaration
> -declare i32 @strcpy(...)
> diff --git a/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll b/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
> deleted file mode 100644
> index ac89199..0000000
> --- a/test/Transforms/SimplifyLibCalls/2009-02-11-NotInitialized.ll
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -; RUN: opt < %s -inline -simplify-libcalls -functionattrs | \
> -; RUN: llvm-dis | grep nocapture | count 2
> -; Check that nocapture attributes are added when run after an SCC pass.
> -; PR3520
> -
> -define i32 @use(i8* %x) nounwind readonly {
> -entry:
> - %0 = tail call i64 @strlen(i8* %x) nounwind readonly ; <i64> [#uses=1]
> - %1 = trunc i64 %0 to i32 ; <i32> [#uses=1]
> - ret i32 %1
> -}
> -
> -declare i64 @strlen(i8*) nounwind readonly
>
More information about the llvm-commits
mailing list