Skip to content

Commit

Permalink
[RISCV] Fix uninitialized variable after call to evaluateConstantImm
Browse files Browse the repository at this point in the history 
For llvm/test/MC/RISCV/rv64i-aliases-invalid.s, UBSan reports:

lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp:371:9: runtime error:
load of value 3879186881, which is not a valid value for type
'RISCVMCExpr::VariantKind'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior
lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp:371:9 in

It turns out that evaluateConstantImm does not set `VK` and it remains
unitialized when doing comparisons in `isImmXLenLI()`.

Differential Revision: https://reviews.llvm.org/D65347

llvm-svn: 367230
  • Loading branch information
@francisvm
francisvm committed Jul 29, 2019
1 parent 89fb9e8 commit d42289e
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
View file
Expand Up @@ -276,7 +276,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
// modifiers and isShiftedInt<N-1, 1>(Op).
template <int N> bool isBareSimmNLsb0() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
Expand All @@ -292,7 +292,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isBareSymbol() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
// Must be of 'immediate' type but not a constant.
if (!isImm() || evaluateConstantImm(getImm(), Imm, VK))
return false;
Expand All @@ -302,7 +302,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isCallSymbol() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
// Must be of 'immediate' type but not a constant.
if (!isImm() || evaluateConstantImm(getImm(), Imm, VK))
return false;
Expand All @@ -313,7 +313,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isTPRelAddSymbol() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
// Must be of 'immediate' type but not a constant.
if (!isImm() || evaluateConstantImm(getImm(), Imm, VK))
return false;
Expand Down Expand Up @@ -364,7 +364,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isImmXLenLI() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
Expand All @@ -378,7 +378,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isUImmLog2XLen() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
if (!evaluateConstantImm(getImm(), Imm, VK) ||
Expand All @@ -389,7 +389,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isUImmLog2XLenNonZero() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
if (!evaluateConstantImm(getImm(), Imm, VK) ||
Expand All @@ -402,7 +402,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isUImm5() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
Expand All @@ -411,7 +411,7 @@ struct RISCVOperand : public MCParsedAsmOperand {

bool isUImm5NonZero() const {
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
if (!isImm())
return false;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
Expand All @@ -422,7 +422,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
bool isSImm6() const {
if (!isImm())
return false;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
int64_t Imm;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isInt<6>(Imm) &&
Expand All @@ -432,7 +432,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
bool isSImm6NonZero() const {
if (!isImm())
return false;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
int64_t Imm;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isInt<6>(Imm) && (Imm != 0) &&
Expand All @@ -443,7 +443,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && (Imm != 0) &&
(isUInt<5>(Imm) || (Imm >= 0xfffe0 && Imm <= 0xfffff)) &&
Expand All @@ -454,7 +454,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isShiftedUInt<5, 2>(Imm) &&
VK == RISCVMCExpr::VK_RISCV_None;
Expand All @@ -464,7 +464,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isShiftedUInt<6, 2>(Imm) &&
VK == RISCVMCExpr::VK_RISCV_None;
Expand All @@ -474,7 +474,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isShiftedUInt<5, 3>(Imm) &&
VK == RISCVMCExpr::VK_RISCV_None;
Expand All @@ -486,7 +486,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isShiftedUInt<6, 3>(Imm) &&
VK == RISCVMCExpr::VK_RISCV_None;
Expand All @@ -496,14 +496,14 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && isShiftedUInt<8, 2>(Imm) && (Imm != 0) &&
VK == RISCVMCExpr::VK_RISCV_None;
}

bool isSImm12() const {
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
int64_t Imm;
bool IsValid;
if (!isImm())
Expand All @@ -527,14 +527,14 @@ struct RISCVOperand : public MCParsedAsmOperand {
if (!isImm())
return false;
int64_t Imm;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstantImm = evaluateConstantImm(getImm(), Imm, VK);
return IsConstantImm && (Imm != 0) && isShiftedInt<6, 4>(Imm) &&
VK == RISCVMCExpr::VK_RISCV_None;
}

bool isUImm20LUI() const {
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
int64_t Imm;
bool IsValid;
if (!isImm())
Expand All @@ -552,7 +552,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
}

bool isUImm20AUIPC() const {
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
int64_t Imm;
bool IsValid;
if (!isImm())
Expand Down Expand Up @@ -664,7 +664,7 @@ struct RISCVOperand : public MCParsedAsmOperand {
void addExpr(MCInst &Inst, const MCExpr *Expr) const {
assert(Expr && "Expr shouldn't be null!");
int64_t Imm = 0;
RISCVMCExpr::VariantKind VK;
RISCVMCExpr::VariantKind VK = RISCVMCExpr::VK_RISCV_None;
bool IsConstant = evaluateConstantImm(Expr, Imm, VK);

if (IsConstant)
Expand Down

0 comments on commit d42289e

Please sign in to comment.