2 files changed, 34 insertions, 4 deletions
diff --git a/clang/test/ARCMT/objcmt-ns-macros.m b/clang/test/ARCMT/objcmt-ns-macros.m
index 55bb67d3d5a..1ee675cd746 100644
--- a/clang/test/ARCMT/objcmt-ns-macros.m
+++ b/clang/test/ARCMT/objcmt-ns-macros.m
@@ -66,8 +66,8 @@ enum {
 
 // Should use NS_ENUM even though it is all power of 2.
 enum {
-  UIKOne = 0x1,
-  UIKTwo = 0x2,
+  UIKOne = 1,
+  UIKTwo = 2,
 };
 typedef NSInteger UIK;
 
@@ -77,3 +77,18 @@ typedef enum  {
     NSTickMarkLeft = NSTickMarkAbove,
     NSTickMarkRight = NSTickMarkBelow
 } NSTickMarkPosition;
+
+enum {
+    UIViewNone         = 0x0,
+    UIViewMargin       = 0x1,
+    UIViewWidth        = 0x2,
+    UIViewRightMargin  = 0x3,
+    UIViewBottomMargin = 0xbadbeef
+};
+typedef NSInteger UITableStyle;
+
+enum {
+    UIView0         = 0,
+    UIView1 = 0XBADBEEF
+};
+typedef NSInteger UIStyle;
diff --git a/clang/test/ARCMT/objcmt-ns-macros.m.result b/clang/test/ARCMT/objcmt-ns-macros.m.result
index 245659d08b6..cd0fc8789da 100644
--- a/clang/test/ARCMT/objcmt-ns-macros.m.result
+++ b/clang/test/ARCMT/objcmt-ns-macros.m.result
@@ -66,8 +66,8 @@ enum {
 
 // Should use NS_ENUM even though it is all power of 2.
 typedef NS_ENUM(NSInteger, UIK) {
-  UIKOne = 0x1,
-  UIKTwo = 0x2,
+  UIKOne = 1,
+  UIKTwo = 2,
 };
 
 
@@ -77,3 +77,18 @@ typedef NS_ENUM(NSInteger, NSTickMarkPosition)  {
     NSTickMarkLeft = NSTickMarkAbove,
     NSTickMarkRight = NSTickMarkBelow
 } ;
+
+typedef NS_OPTIONS(NSUInteger, UITableStyle) {
+    UIViewNone         = 0x0,
+    UIViewMargin       = 0x1,
+    UIViewWidth        = 0x2,
+    UIViewRightMargin  = 0x3,
+    UIViewBottomMargin = 0xbadbeef
+};
+
+
+typedef NS_OPTIONS(NSUInteger, UIStyle) {
+    UIView0         = 0,
+    UIView1 = 0XBADBEEF
+};
+