6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-30 04:56:49 +00:00
Code Issues Projects Releases Wiki Activity

revert r160742: it's breaking CMake build

Browse Source 
original commit msg:
MemoryBuiltins: add support to determine the size of strdup'ed non-constant strings

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160751 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nuno Lopes 2012-07-25 18:49:28 +00:00
parent d68e8cda24
commit 6e699bf38d
4 changed files with 9 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Analysis/MemoryBuiltins.h
View File

@ -201,7 +201,6 @@ class ObjectSizeOffsetEvaluator
typedef SmallPtrSet<const Value*, 8> PtrSetTy;
const TargetData *TD;
const TargetLibraryInfo *TLI;
LLVMContext &Context;
BuilderTy Builder;
ObjectSizeOffsetVisitor Visitor;
@ -216,8 +215,7 @@ class ObjectSizeOffsetEvaluator
SizeOffsetEvalType compute_(Value *V);
public:
ObjectSizeOffsetEvaluator(const TargetData *TD, const TargetLibraryInfo *TLI,
LLVMContext &Context);
ObjectSizeOffsetEvaluator(const TargetData *TD, LLVMContext &Context);
SizeOffsetEvalType compute(Value *V);
bool knownSize(SizeOffsetEvalType SizeOffset) {

25
lib/Analysis/MemoryBuiltins.cpp
View File

@ -26,7 +26,6 @@
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Transforms/Utils/BuildLibCalls.h"
#include "llvm/Transforms/Utils/Local.h"
using namespace llvm;
@ -449,9 +448,11 @@ SizeOffsetType ObjectSizeOffsetVisitor::visitCallSite(CallSite CS) {
return std::make_pair(Size, Zero);
// TODO: handle more standard functions (+ wchar cousins):
// - strdup / strndup
// - strcpy / strncpy
// - strcat / strncat
// - memcpy / memmove
// - strcat / strncat
// - memset
}
@ -523,9 +524,8 @@ SizeOffsetType ObjectSizeOffsetVisitor::visitInstruction(Instruction &I) {
ObjectSizeOffsetEvaluator::ObjectSizeOffsetEvaluator(const TargetData *TD,
const TargetLibraryInfo *TLI,
LLVMContext &Context)
: TD(TD), TLI(TLI), Context(Context), Builder(Context, TargetFolder(TD)),
: TD(TD), Context(Context), Builder(Context, TargetFolder(TD)),
Visitor(TD, Context) {
IntTy = TD->getIntPtrType(Context);
Zero = ConstantInt::get(IntTy, 0);
@ -619,21 +619,8 @@ SizeOffsetEvalType ObjectSizeOffsetEvaluator::visitCallSite(CallSite CS) {
// handle strdup-like functions separately
if (FnData->AllocTy == StrDupLike) {
IRBuilder<> StdBuilder(Builder.GetInsertPoint());
Value *Size;
// strdup(str): size = strlen(str)+1
if (FnData->FstParam < 0)
Size = EmitStrLen(CS.getArgument(0), StdBuilder, TD, TLI);
else
// strndup(str, maxlen): size = strnlen(str, maxlen)+1
Size = EmitStrNLen(CS.getArgument(0), CS.getArgument(FnData->FstParam),
StdBuilder, TD, TLI);
if (!Size)
return unknown();
Builder.SetInsertPoint(StdBuilder.GetInsertPoint());
Size = Builder.CreateNUWAdd(Size, ConstantInt::get(IntTy, 1));
return std::make_pair(Size, Zero);
// TODO
return unknown();
}
Value *FirstArg = CS.getArgument(FnData->FstParam);
@ -647,9 +634,11 @@ SizeOffsetEvalType ObjectSizeOffsetEvaluator::visitCallSite(CallSite CS) {
return std::make_pair(Size, Zero);
// TODO: handle more standard functions (+ wchar cousins):
// - strdup / strndup
// - strcpy / strncpy
// - strcat / strncat
// - memcpy / memmove
// - strcat / strncat
// - memset
}

5
lib/Transforms/Instrumentation/BoundsChecking.cpp
View File

@ -24,7 +24,6 @@
#include "llvm/Support/TargetFolder.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetLibraryInfo.h"
#include "llvm/Transforms/Instrumentation.h"
using namespace llvm;
@ -49,7 +48,6 @@ namespace {
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.addRequired<TargetData>();
AU.addRequired<TargetLibraryInfo>();
}
private:
@ -168,12 +166,11 @@ bool BoundsChecking::instrument(Value *Ptr, Value *InstVal) {
bool BoundsChecking::runOnFunction(Function &F) {
TD = &getAnalysis<TargetData>();
const TargetLibraryInfo *TLI = &getAnalysis<TargetLibraryInfo>();
TrapBB = 0;
BuilderTy TheBuilder(F.getContext(), TargetFolder(TD));
Builder = &TheBuilder;
ObjectSizeOffsetEvaluator TheObjSizeEval(TD, TLI, F.getContext());
ObjectSizeOffsetEvaluator TheObjSizeEval(TD, F.getContext());
ObjSizeEval = &TheObjSizeEval;
// check HANDLE_MEMORY_INST in include/llvm/Instruction.def for memory

31
test/Instrumentation/BoundsChecking/strings.ll
View File

@ -1,31 +0,0 @@
; RUN: opt < %s -bounds-checking -S | FileCheck %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
declare noalias i8* @strdup(i8* nocapture) nounwind
declare noalias i8* @strndup(i8* nocapture, i64) nounwind
; CHECK: @f1
define i8 @f1(i8* nocapture %str, i8** nocapture %esc) nounwind uwtable ssp {
; CHECK: call i64 @strlen(i8* %str)
; CHECK-NEXT: %1 = add nuw i64 {{.*}}, 1
%call = tail call i8* @strdup(i8* %str) nounwind
store i8* %call, i8** %esc, align 8
%arrayidx = getelementptr inbounds i8* %call, i64 3
; CHECK: sub i64 %1, 3
%1 = load i8* %arrayidx, align 1
ret i8 %1
; CHECK: call void @llvm.trap
}
; CHECK: @f2
define i8 @f2(i8* nocapture %str, i8** nocapture %esc, i64 %limit) nounwind uwtable ssp {
; CHECK: call i64 @strnlen(i8* %str, i64 %limit)
; CHECK-NEXT: %1 = add nuw i64 {{.*}}, 1
%call = tail call i8* @strndup(i8* %str, i64 %limit) nounwind
store i8* %call, i8** %esc, align 8
%arrayidx = getelementptr inbounds i8* %call, i64 3
; CHECK: sub i64 %1, 3
%1 = load i8* %arrayidx, align 1
ret i8 %1
; CHECK: call void @llvm.trap
}