[PATCH] D81857: Fix ConstantAggregateBuilderBase::getRelativeOffset

[Arnold Schwaighofer via Phabricator via cfe-commits]

aschwaighofer created this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
aschwaighofer added a reviewer: rjmccall.

If a record has a mix of relative pointers and other fields they
wouldn't necessarily be the same.

Fallout from D77592 <https://reviews.llvm.org/D77592>.

rdar://64309883


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D81857

Files:
  clang/lib/CodeGen/ConstantInitBuilder.cpp


Index: clang/lib/CodeGen/ConstantInitBuilder.cpp
===================================================================
--- clang/lib/CodeGen/ConstantInitBuilder.cpp
+++ clang/lib/CodeGen/ConstantInitBuilder.cpp
@@ -129,7 +129,7 @@
 ConstantAggregateBuilderBase::getRelativeOffset(llvm::IntegerType *offsetType,
                                                 llvm::Constant *target) {
   return getRelativeOffsetToPosition(offsetType, target,
-                                     Builder.SelfReferences.size());
+                                     Builder.Buffer.size() - Begin);
 }
 
 llvm::Constant *ConstantAggregateBuilderBase::getRelativeOffsetToPosition(



Index: clang/lib/CodeGen/ConstantInitBuilder.cpp
===================================================================
--- clang/lib/CodeGen/ConstantInitBuilder.cpp
+++ clang/lib/CodeGen/ConstantInitBuilder.cpp
@@ -129,7 +129,7 @@
 ConstantAggregateBuilderBase::getRelativeOffset(llvm::IntegerType *offsetType,
                                                 llvm::Constant *target) {
   return getRelativeOffsetToPosition(offsetType, target,
-                                     Builder.SelfReferences.size());
+                                     Builder.Buffer.size() - Begin);
 }
 
 llvm::Constant *ConstantAggregateBuilderBase::getRelativeOffsetToPosition(

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits