Feedback

Author: JanekvO

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

@@ -8285,7 +8285,7 @@ void AMDGPUAsmParser::onBeginOfFile() {
 ///           max(expr, ...)
 ///
 bool AMDGPUAsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
-  using AGVK = AMDGPUVariadicMCExpr::AMDGPUVariadicKind;
+  using AGVK = AMDGPUVariadicMCExpr::VariadicKind;
 
   if (isToken(AsmToken::Identifier)) {
     StringRef TokenId = getTokenStr();

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp

@@ -18,15 +18,15 @@
 using namespace llvm;
 
 const AMDGPUVariadicMCExpr *
-AMDGPUVariadicMCExpr::create(AMDGPUVariadicKind Kind,
-                             ArrayRef<const MCExpr *> Args, MCContext &Ctx) {
+AMDGPUVariadicMCExpr::create(VariadicKind Kind, ArrayRef<const MCExpr *> Args,
+                             MCContext &Ctx) {
   return new (Ctx) AMDGPUVariadicMCExpr(Kind, Args);
 }
 
-const MCExpr *AMDGPUVariadicMCExpr::GetSubExpr(size_t index) const {
-  assert(index < Args.size() &&
+const MCExpr *AMDGPUVariadicMCExpr::getSubExpr(size_t Index) const {
+  assert(Index < Args.size() &&
          "Indexing out of bounds AMDGPUVariadicMCExpr sub-expr");
-  return Args[index];
+  return Args[Index];
 }
 
 void AMDGPUVariadicMCExpr::printImpl(raw_ostream &OS,
@@ -49,14 +49,14 @@ void AMDGPUVariadicMCExpr::printImpl(raw_ostream &OS,
   OS << ')';
 }
 
-static int64_t Op(AMDGPUVariadicMCExpr::AMDGPUVariadicKind Kind, int64_t Arg1,
+static int64_t op(AMDGPUVariadicMCExpr::VariadicKind Kind, int64_t Arg1,
                   int64_t Arg2) {
   switch (Kind) {
   default:
     llvm_unreachable("Unknown AMDGPUVariadicMCExpr kind.");
-  case AMDGPUVariadicMCExpr::AMDGPUVariadicKind::AGVK_Max:
+  case AMDGPUVariadicMCExpr::AGVK_Max:
     return std::max(Arg1, Arg2);
-  case AMDGPUVariadicMCExpr::AMDGPUVariadicKind::AGVK_Or:
+  case AMDGPUVariadicMCExpr::AGVK_Or:
     return Arg1 || Arg2;
   }
 }
@@ -73,7 +73,7 @@ bool AMDGPUVariadicMCExpr::evaluateAsRelocatableImpl(
 
     if (!Total.has_value())
       Total = ArgRes.getConstant();
-    Total = Op(Kind, *Total, ArgRes.getConstant());
+    Total = op(Kind, *Total, ArgRes.getConstant());
   }
 
   Res = MCValue::get(*Total);

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.h

@@ -27,34 +27,35 @@ namespace llvm {
 ///
 class AMDGPUVariadicMCExpr : public MCTargetExpr {
 public:
-  enum AMDGPUVariadicKind { AGVK_None, AGVK_Or, AGVK_Max };
+  enum VariadicKind { AGVK_None, AGVK_Or, AGVK_Max };
 
 private:
-  AMDGPUVariadicKind Kind;
+  VariadicKind Kind;
   SmallVector<const MCExpr *, 2> Args;
 
-  AMDGPUVariadicMCExpr(AMDGPUVariadicKind Kind, ArrayRef<const MCExpr *> Args)
+  AMDGPUVariadicMCExpr(VariadicKind Kind, ArrayRef<const MCExpr *> Args)
       : Kind(Kind), Args(Args) {
     assert(Args.size() >= 1 && "Needs a minimum of one expression.");
+    assert(Kind != AGVK_None &&
+           "Cannot construct AMDGPUVariadicMCExpr of kind none.");
   }
 
 public:
-  static const AMDGPUVariadicMCExpr *create(AMDGPUVariadicKind Kind,
-                                            ArrayRef<const MCExpr *> Args,
-                                            MCContext &Ctx);
+  static const AMDGPUVariadicMCExpr *
+  create(VariadicKind Kind, ArrayRef<const MCExpr *> Args, MCContext &Ctx);
 
   static const AMDGPUVariadicMCExpr *createOr(ArrayRef<const MCExpr *> Args,
                                               MCContext &Ctx) {
-    return create(AMDGPUVariadicKind::AGVK_Or, Args, Ctx);
+    return create(VariadicKind::AGVK_Or, Args, Ctx);
   }
 
   static const AMDGPUVariadicMCExpr *createMax(ArrayRef<const MCExpr *> Args,
                                                MCContext &Ctx) {
-    return create(AMDGPUVariadicKind::AGVK_Max, Args, Ctx);
+    return create(VariadicKind::AGVK_Max, Args, Ctx);
   }
 
-  AMDGPUVariadicKind getKind() const { return Kind; }
-  const MCExpr *GetSubExpr(size_t index) const;
+  VariadicKind getKind() const { return Kind; }
+  const MCExpr *getSubExpr(size_t Index) const;
 
   void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
   bool evaluateAsRelocatableImpl(MCValue &Res, const MCAsmLayout *Layout,

llvm/test/MC/AMDGPU/mcexpr_amd_err.s

@@ -40,5 +40,14 @@
 // ASM: :[[@LINE-1]]:{{[0-9]+}}: error: unexpected token in or expression
 // ASM: :[[@LINE-2]]:{{[0-9]+}}: error: missing expression
 
+.set max_no_lparen, max four, five)
+// ASM: :[[@LINE-1]]:{{[0-9]+}}: error: expected newline
+
+.set max_no_paren, max one, two, three
+// ASM: :[[@LINE-1]]:{{[0-9]+}}: error: expected newline
+
+.set max_rparen_only, max)
+// ASM: :[[@LINE-1]]:{{[0-9]+}}: error: expected newline
+
 .set four, 4
 .set five, 5