[llvm-branch-commits] [cfe-branch] r243028 - Merging r243018:

[Hans Wennborg]

Author: hans
Date: Thu Jul 23 12:52:26 2015
New Revision: 243028

URL: http://llvm.org/viewvc/llvm-project?rev=243028&view=rev
Log:
Merging r243018:
------------------------------------------------------------------------
r243018 | alexdenisov | 2015-07-23 07:45:41 -0700 (Thu, 23 Jul 2015) | 5 lines

Add missing files for objc_boxable feature.

Original patch [r240761] is missing all new files because of committer's mistake.


------------------------------------------------------------------------

Added:
    cfe/branches/release_37/test/CodeGenObjC/Inputs/nsvalue-boxed-expressions-support.h
      - copied unchanged from r243018, cfe/trunk/test/CodeGenObjC/Inputs/nsvalue-boxed-expressions-support.h
    cfe/branches/release_37/test/CodeGenObjC/nsvalue-objc-boxable-ios-arc.m
      - copied unchanged from r243018, cfe/trunk/test/CodeGenObjC/nsvalue-objc-boxable-ios-arc.m
    cfe/branches/release_37/test/CodeGenObjC/nsvalue-objc-boxable-ios.m
      - copied unchanged from r243018, cfe/trunk/test/CodeGenObjC/nsvalue-objc-boxable-ios.m
    cfe/branches/release_37/test/CodeGenObjC/nsvalue-objc-boxable-mac-arc.m
      - copied unchanged from r243018, cfe/trunk/test/CodeGenObjC/nsvalue-objc-boxable-mac-arc.m
    cfe/branches/release_37/test/CodeGenObjC/nsvalue-objc-boxable-mac.m
      - copied unchanged from r243018, cfe/trunk/test/CodeGenObjC/nsvalue-objc-boxable-mac.m
    cfe/branches/release_37/test/Lexer/has_attribute_objc_boxable.m
      - copied unchanged from r243018, cfe/trunk/test/Lexer/has_attribute_objc_boxable.m
    cfe/branches/release_37/test/Lexer/has_feature_boxed_nsvalue_expressions.m
      - copied unchanged from r243018, cfe/trunk/test/Lexer/has_feature_boxed_nsvalue_expressions.m
    cfe/branches/release_37/test/PCH/objc_boxable.m
      - copied unchanged from r243018, cfe/trunk/test/PCH/objc_boxable.m
    cfe/branches/release_37/test/PCH/objc_boxable_record.h
      - copied unchanged from r243018, cfe/trunk/test/PCH/objc_boxable_record.h
    cfe/branches/release_37/test/PCH/objc_boxable_record_attr.h
      - copied unchanged from r243018, cfe/trunk/test/PCH/objc_boxable_record_attr.h
    cfe/branches/release_37/test/SemaObjC/objc-boxed-expressions-nsvalue.m
      - copied unchanged from r243018, cfe/trunk/test/SemaObjC/objc-boxed-expressions-nsvalue.m
    cfe/branches/release_37/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm
      - copied unchanged from r243018, cfe/trunk/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm
Modified:
    cfe/branches/release_37/   (props changed)

Propchange: cfe/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 23 12:52:26 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242678
+/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242678,243018
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920