diff options
| -rw-r--r-- | lib/Transforms/Instrumentation/DataFlowSanitizer.cpp | 13 | ||||
| -rw-r--r-- | test/Instrumentation/DataFlowSanitizer/Inputs/abilist.txt | 4 | ||||
| -rw-r--r-- | test/Instrumentation/DataFlowSanitizer/abilist.ll | 15 |
3 files changed, 28 insertions, 4 deletions
diff --git a/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp b/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp index e92d88d..1bf6b99 100644 --- a/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp +++ b/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp @@ -470,7 +470,8 @@ bool DataFlowSanitizer::runOnModule(Module &M) { FnsToInstrument.push_back(&*i); } - // Give function aliases prefixes when necessary. + // Give function aliases prefixes when necessary, and build wrappers where the + // instrumentedness is inconsistent. for (Module::alias_iterator i = M.alias_begin(), e = M.alias_end(); i != e;) { GlobalAlias *GA = &*i; ++i; @@ -481,6 +482,16 @@ bool DataFlowSanitizer::runOnModule(Module &M) { bool GAInst = isInstrumented(GA), FInst = isInstrumented(F); if (GAInst && FInst) { addGlobalNamePrefix(GA); + } else if (GAInst != FInst) { + // Non-instrumented alias of an instrumented function, or vice versa. + // Replace the alias with a native-ABI wrapper of the aliasee. The pass + // below will take care of instrumenting it. + Function *NewF = + buildWrapperFunction(F, "", GA->getLinkage(), F->getFunctionType()); + GA->replaceAllUsesWith(NewF); + NewF->takeName(GA); + GA->eraseFromParent(); + FnsToInstrument.push_back(NewF); } } } diff --git a/test/Instrumentation/DataFlowSanitizer/Inputs/abilist.txt b/test/Instrumentation/DataFlowSanitizer/Inputs/abilist.txt index fec2a50..42e34e4 100644 --- a/test/Instrumentation/DataFlowSanitizer/Inputs/abilist.txt +++ b/test/Instrumentation/DataFlowSanitizer/Inputs/abilist.txt @@ -1,5 +1,5 @@ -fun:discard=uninstrumented -fun:discard=discard +fun:discard*=uninstrumented +fun:discard*=discard fun:functional=uninstrumented fun:functional=functional diff --git a/test/Instrumentation/DataFlowSanitizer/abilist.ll b/test/Instrumentation/DataFlowSanitizer/abilist.ll index 3343221..4e23bf1 100644 --- a/test/Instrumentation/DataFlowSanitizer/abilist.ll +++ b/test/Instrumentation/DataFlowSanitizer/abilist.ll @@ -29,6 +29,12 @@ define void @f() { ret void } +; CHECK: define i32 (i32, i32)* @discardg(i32) +; CHECK: %[[CALL:.*]] = call { i32 (i32, i32)*, i16 } @"dfs$g"(i32 %0, i16 0) +; CHECK: %[[XVAL:.*]] = extractvalue { i32 (i32, i32)*, i16 } %[[CALL]], 0 +; CHECK: ret {{.*}} %[[XVAL]] +@discardg = alias i32 (i32, i32)* (i32)* @g + ; CHECK: define linkonce_odr { i32, i16 } @"dfsw$custom2"(i32, i32, i16, i16) ; CHECK: %[[LABELRETURN2:.*]] = alloca i16 ; CHECK: %[[RV:.*]] = call i32 @__dfsw_custom2 @@ -38,10 +44,17 @@ define void @f() { ; CHECK: ret { i32, i16 } ; CHECK: @"dfs$g" -define i32 (i32, i32)* @g() { +define i32 (i32, i32)* @g(i32) { ; CHECK: ret {{.*}} @"dfsw$custom2" ret i32 (i32, i32)* @custom2 } +; CHECK: define { i32, i16 } @"dfs$adiscard"(i32, i32, i16, i16) +; CHECK: %[[CALL:.*]] = call i32 @discard(i32 %0, i32 %1) +; CHECK: %[[IVAL0:.*]] = insertvalue { i32, i16 } undef, i32 %[[CALL]], 0 +; CHECK: %[[IVAL1:.*]] = insertvalue { i32, i16 } %[[IVAL0]], i16 0, 1 +; CHECK: ret { i32, i16 } %[[IVAL1]] +@adiscard = alias i32 (i32, i32)* @discard + ; CHECK: declare void @__dfsw_custom1(i32, i32, i16, i16) ; CHECK: declare i32 @__dfsw_custom2(i32, i32, i16, i16, i16*) |