Skip to content

Commit

Permalink
More followup type changes after 0539246
Browse files Browse the repository at this point in the history
  • Loading branch information
aeubanks committed Oct 8, 2021
1 parent 88a941b commit a3358fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions llvm/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
Expand Up @@ -42,9 +42,9 @@ struct ASanStackVariableDescription {

// Output data struct for ComputeASanStackFrameLayout.
struct ASanStackFrameLayout {
size_t Granularity; // Shadow granularity.
size_t FrameAlignment; // Alignment for the entire frame.
size_t FrameSize; // Size of the frame in bytes.
uint64_t Granularity; // Shadow granularity.
uint64_t FrameAlignment; // Alignment for the entire frame.
uint64_t FrameSize; // Size of the frame in bytes.
};

ASanStackFrameLayout ComputeASanStackFrameLayout(
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
Expand Up @@ -3179,7 +3179,7 @@ Value *FunctionStackPoisoner::createAllocaForLayout(
assert(Alloca->isStaticAlloca());
}
assert((ClRealignStack & (ClRealignStack - 1)) == 0);
size_t FrameAlignment = std::max(L.FrameAlignment, (size_t)ClRealignStack);
uint64_t FrameAlignment = std::max(L.FrameAlignment, uint64_t(ClRealignStack));
Alloca->setAlignment(Align(FrameAlignment));
return IRB.CreatePointerCast(Alloca, IntptrTy);
}
Expand Down

0 comments on commit a3358fc

Please sign in to comment.