[CIR] Implement non-virtual thunk generation for multiple inheritance #2029
+1,355 −90
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
lanza requested review from andykaylor, bcardosolopes and xlauko as code owners 
| } | ||
| | ||
| if (ShouldXRayInstrumentFunction()) { | ||
| if (d && ShouldXRayInstrumentFunction()) { |
| assert(builder.getInsertionBlock() && "Should be valid"); | ||
| | ||
| auto fnEndLoc = getLoc(fd->getBody()->getEndLoc()); | ||
| auto fnEndLoc = (fd && fd->getBody()) ? getLoc(fd->getBody()->getEndLoc()) |
Member
There was a problem hiding this comment.
These several extra changes on locations don't seem necessary (though probably good to have) and are very distracting
| func.setGlobalVisibilityAttr(getGlobalVisibilityAttrFromDecl(decl)); | ||
| getTargetCIRGenInfo().setTargetAttributes(funcDecl, func, *this); | ||
| | ||
| if (const auto *_ = funcDecl->getAttr<CodeSegAttr>()) |
Member
There was a problem hiding this comment.
Should both of these NYI assertions be "assert on missing feature" instead? or not handling them cause horrible miscompilations?
| assert(!cir::MissingFeatures::ABIArgInfo()); | ||
| const CIRGenFunctionInfo &callFnInfo = CGM.getTypes().arrangeCXXMethodCall( | ||
| callArgs, fpt, RequiredArgs::forPrototypePlus(fpt, 1), prefixArgs); | ||
| // assert(callFnInfo.getRegParm() == CurFnInfo->getRegParm() && |
Member
There was a problem hiding this comment.
What's the story with these commented pieces?
| @@ -0,0 +1,35 @@ | |||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o %t.cir.ll | |||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm %s -o %t.codegen.ll | |||
| // RUN: FileCheck --input-file=%t.cir.ll %s --check-prefix=CIR | |||
Member
There was a problem hiding this comment.
I think LLVM vs OCCG here would be more clear. Why there's no proper CIR output here?
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Stack from ghstack (oldest at bottom):
This patch implements full support for generating non-virtual thunks in
ClangIR to handle C++ multiple inheritance scenarios where the same virtual
function must be accessible through different base class pointers with
different this-pointer offsets.