diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -5109,16 +5109,16 @@
   OPTIONAL(name, MDStringField, );                                             \
   OPTIONAL(file, MDField, );                                                   \
   OPTIONAL(line, LineField, );                                                 \
-  OPTIONAL(setter, MDStringField, );                                           \
   OPTIONAL(getter, MDStringField, );                                           \
+  OPTIONAL(setter, MDStringField, );                                           \
   OPTIONAL(attributes, MDUnsignedField, (0, UINT32_MAX));                      \
   OPTIONAL(type, MDField, );
   PARSE_MD_FIELDS();
 #undef VISIT_MD_FIELDS
 
   Result = GET_OR_DISTINCT(DIObjCProperty,
-                           (Context, name.Val, file.Val, line.Val, setter.Val,
-                            getter.Val, attributes.Val, type.Val));
+                           (Context, name.Val, file.Val, line.Val, getter.Val,
+                            setter.Val, attributes.Val, type.Val));
   return false;
 }
 
diff --git a/llvm/test/Assembler/diobjcproperty.ll b/llvm/test/Assembler/diobjcproperty.ll
--- a/llvm/test/Assembler/diobjcproperty.ll
+++ b/llvm/test/Assembler/diobjcproperty.ll
@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
+; RUN: opt -S < %s | FileCheck %s
 
 ; CHECK: !named = !{!0, !1, !2, !3, !4, !4}
 !named = !{!0, !1, !2, !3, !4, !5}