Skip to content

[SYCL] Use a copy to avoid invalidated access #2495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions clang/lib/CodeGen/CodeGenModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2273,12 +2273,13 @@ void CodeGenModule::EmitDeferred() {
auto DDI = DeferredDecls.find(AliaseeName);
// Emit what is aliased first.
if (DDI != DeferredDecls.end()) {
llvm::GlobalValue *AliaseeGV = dyn_cast<llvm::GlobalValue>(
GetAddrOfGlobal(DDI->second, ForDefinition));
GlobalDecl GD = DDI->second;
llvm::GlobalValue *AliaseeGV =
dyn_cast<llvm::GlobalValue>(GetAddrOfGlobal(GD, ForDefinition));
if (!AliaseeGV)
AliaseeGV = GetGlobalValue(getMangledName(DDI->second));
AliaseeGV = GetGlobalValue(getMangledName(GD));
assert(AliaseeGV);
EmitGlobalDefinition(DDI->second, AliaseeGV);
EmitGlobalDefinition(GD, AliaseeGV);
// Remove the entry just added to the DeferredDeclsToEmit
// since we have emitted it.
DeferredDeclsToEmit.pop_back();
Expand Down