summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2012-03-30 04:16:06 +0000
committerEli Friedman <eli.friedman@gmail.com>2012-03-30 04:16:06 +0000
commit5a125b4040212c7955dc7f93080eae3bf1c7c4aa (patch)
tree3daaf2caf1235e5e9afddf5f8d7ca0035672006c /clang/lib/CodeGen
parenta154dd5b33dc1e8b7d2c09e88dbba39486c26271 (diff)
downloadbcm5719-llvm-5a125b4040212c7955dc7f93080eae3bf1c7c4aa.tar.gz
bcm5719-llvm-5a125b4040212c7955dc7f93080eae3bf1c7c4aa.zip
Missing piece of r153720: make sure the vtable pointer is handled correctly.
llvm-svn: 153721
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGExprConstant.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index 60cb4c5c23a..d528e0c4b72 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -102,7 +102,7 @@ void ConstStructBuilder::AppendVTablePointer(BaseSubobject Base,
llvm::ConstantExpr::getInBoundsGetElementPtr(VTable, Indices);
// Add the vtable at the start of the object.
- AppendBytes(CharUnits::Zero(), VTableAddressPoint);
+ AppendBytes(Base.getBaseOffset(), VTableAddressPoint);
}
void ConstStructBuilder::
OpenPOWER on IntegriCloud