diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
| commit | b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a (patch) | |
| tree | 7462cd2988228ae24c40b37a9382d35874bbf099 /lib/CodeGen/SjLjEHPrepare.cpp | |
| parent | 23d8d191eff180ba312a4d1b4fec8597e5a988d5 (diff) | |
| parent | 4ef61f2ad4ff509ee05c7051d359009511f81226 (diff) | |
| download | llvm-embtk-support-master.tar.gz llvm-embtk-support-master.tar.bz2 llvm-embtk-support-master.tar.xz | |
Merge branch 'master' into embtk-support-masterembtk-support-master
Diffstat (limited to 'lib/CodeGen/SjLjEHPrepare.cpp')
| -rw-r--r-- | lib/CodeGen/SjLjEHPrepare.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/CodeGen/SjLjEHPrepare.cpp b/lib/CodeGen/SjLjEHPrepare.cpp index 3903743878..23984e9986 100644 --- a/lib/CodeGen/SjLjEHPrepare.cpp +++ b/lib/CodeGen/SjLjEHPrepare.cpp @@ -222,7 +222,9 @@ setupFunctionContext(Function &F, ArrayRef<LandingPadInst*> LPads) { PersonalityFn = LPads[0]->getPersonalityFn(); Value *PersonalityFieldPtr = Builder.CreateConstGEP2_32(FuncCtx, 0, 3, "pers_fn_gep"); - Builder.CreateStore(PersonalityFn, PersonalityFieldPtr, /*isVolatile=*/true); + Builder.CreateStore(Builder.CreateBitCast(PersonalityFn, + Builder.getInt8PtrTy()), + PersonalityFieldPtr, /*isVolatile=*/true); // LSDA address Value *LSDA = Builder.CreateCall(LSDAAddrFn, "lsda_addr"); |