Index: test/Sema/attr-minsize.c
===================================================================
--- test/Sema/attr-minsize.c	(revision 0)
+++ test/Sema/attr-minsize.c	(revision 0)
@@ -0,0 +1,5 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+int foo() __attribute__((__minsize__));
+
+int var1 __attribute__((__minsize__)); // expected-error{{'__minsize__' attribute only applies to functions and methods}}
Index: test/CodeGenObjC/attr-minsize.m
===================================================================
--- test/CodeGenObjC/attr-minsize.m	(revision 0)
+++ test/CodeGenObjC/attr-minsize.m	(revision 0)
@@ -0,0 +1,12 @@
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
+
+@interface Test
+- (void)test;
+@end
+
+@implementation Test
+- (void)test __attribute__((minsize)) {
+    // CHECK: define{{.*}}Test test
+    // CHECK: minsize
+}
+@end
Index: test/CodeGen/attr-minsize.c
===================================================================
--- test/CodeGen/attr-minsize.c	(revision 167262)
+++ test/CodeGen/attr-minsize.c	(working copy)
@@ -1,26 +0,0 @@
-// RUN: %clang_cc1 -Oz -emit-llvm %s -o - | FileCheck %s -check-prefix=Oz
-// RUN: %clang_cc1 -O0 -emit-llvm %s -o - | FileCheck %s -check-prefix=OTHER
-// RUN: %clang_cc1 -O1 -emit-llvm %s -o - | FileCheck %s -check-prefix=OTHER
-// RUN: %clang_cc1 -O2 -emit-llvm %s -o - | FileCheck %s -check-prefix=OTHER
-// RUN: %clang_cc1 -O3 -emit-llvm %s -o - | FileCheck %s -check-prefix=OTHER
-// RUN: %clang_cc1 -Os -emit-llvm %s -o - | FileCheck %s -check-prefix=OTHER
-// Check that we set the minsize attribute on each function
-// when Oz optimization level is set.
-
-int test1() {
-  return 42;
-// Oz: @test1{{.*}}minsize
-// Oz: ret
-// OTHER: @test1
-// OTHER-NOT: minsize
-// OTHER: ret
-}
-
-int test2() {
-  return 42;
-// Oz: @test2{{.*}}minsize
-// Oz: ret
-// OTHER: @test2
-// OTHER-NOT: minsize
-// OTHER: ret
-}
Index: test/CodeGen/attr-minsize.cpp
===================================================================
--- test/CodeGen/attr-minsize.cpp	(revision 167192)
+++ test/CodeGen/attr-minsize.cpp	(working copy)
@@ -9,18 +9,67 @@
 
 int test1() {
   return 42;
-// Oz: @test1{{.*}}minsize
+// Oz: @{{.*}}test1{{.*}}minsize
 // Oz: ret
-// OTHER: @test1
+// OTHER: @{{.*}}test1
 // OTHER-NOT: minsize
 // OTHER: ret
 }
 
 int test2() {
   return 42;
-// Oz: @test2{{.*}}minsize
+// Oz: @{{.*}}test2{{.*}}minsize
 // Oz: ret
-// OTHER: @test2
+// OTHER: @{{.*}}test2
 // OTHER-NOT: minsize
 // OTHER: ret
 }
+
+__attribute__((minsize))
+int test3() {
+  return 42;
+// Oz: @{{.*}}test3{{.*}}minsize
+// OTHER: @{{.*}}test3{{.*}}minsize
+}
+
+// Check that the minsize attribute is well propagated through
+// template instantiation
+
+template<typename T>
+__attribute__((minsize))
+void test4(T arg) {
+  return;
+}
+
+template
+void test4<int>(int arg);
+// Oz: define{{.*}}void @{{.*}}test4
+// Oz: minsize
+// OTHER: define{{.*}}void @{{.*}}test4
+// OTHER: minsize
+
+template
+void test4<float>(float arg);
+// Oz: define{{.*}}void @{{.*}}test4
+// Oz: minsize
+// OTHER: define{{.*}}void @{{.*}}test4
+// OTHER: minsize
+
+template<typename T>
+void test5(T arg) {
+  return;
+}
+
+template
+void test5<int>(int arg);
+// Oz: define{{.*}}void @{{.*}}test5
+// Oz: minsize
+// OTHER: define{{.*}}void @{{.*}}test5
+// OTHER-NOT: minsize
+
+template
+void test5<float>(float arg);
+// Oz: define{{.*}}void @{{.*}}test5
+// Oz: minsize
+// OTHER: define{{.*}}void @{{.*}}test5
+// OTHER-NOT: minsize
Index: include/clang/Basic/Attr.td
===================================================================
--- include/clang/Basic/Attr.td	(revision 167262)
+++ include/clang/Basic/Attr.td	(working copy)
@@ -341,6 +341,11 @@
   let SemaHandler = 0;
 }
 
+def MinSize : InheritableAttr {
+  let Spellings = [GNU<"minsize">];
+  let Subjects = [Function];
+}
+
 def Format : InheritableAttr {
   let Spellings = [GNU<"format">];
   let Args = [StringArgument<"Type">, IntArgument<"FormatIdx">,
Index: lib/Sema/SemaDeclAttr.cpp
===================================================================
--- lib/Sema/SemaDeclAttr.cpp	(revision 167262)
+++ lib/Sema/SemaDeclAttr.cpp	(working copy)
@@ -1523,6 +1523,20 @@
                                          Str->getString()));
 }
 
+static void handleMinSizeAttr(Sema &S, Decl *D, const AttributeList &Attr) {
+  // Check the attribute arguments.
+  if (!checkAttributeNumArgs(S, Attr, 0))
+    return;
+
+  if (!isa<FunctionDecl>(D) && !isa<ObjCMethodDecl>(D)) {
+    S.Diag(Attr.getLoc(), diag::err_attribute_wrong_decl_type)
+      << Attr.getName() << ExpectedFunctionOrMethod;
+    return;
+  }
+
+  D->addAttr(::new (S.Context) MinSizeAttr(Attr.getRange(), S.Context));
+}
+
 static void handleColdAttr(Sema &S, Decl *D, const AttributeList &Attr) {
   // Check the attribute arguments.
   if (!checkAttributeNumArgs(S, Attr, 0))
@@ -4285,6 +4299,9 @@
   case AttributeList::AT_ExtVectorType:
     handleExtVectorTypeAttr(S, scope, D, Attr);
     break;
+  case AttributeList::AT_MinSize:
+    handleMinSizeAttr(S, D, Attr);
+    break;
   case AttributeList::AT_Format:      handleFormatAttr      (S, D, Attr); break;
   case AttributeList::AT_FormatArg:   handleFormatArgAttr   (S, D, Attr); break;
   case AttributeList::AT_CUDAGlobal:  handleGlobalAttr      (S, D, Attr); break;
Index: lib/CodeGen/CodeGenModule.cpp
===================================================================
--- lib/CodeGen/CodeGenModule.cpp	(revision 167262)
+++ lib/CodeGen/CodeGenModule.cpp	(working copy)
@@ -583,6 +583,9 @@
   if (D->hasAttr<ColdAttr>())
     F->addFnAttr(llvm::Attributes::OptimizeForSize);
 
+  if (D->hasAttr<MinSizeAttr>())
+    F->addFnAttr(llvm::Attributes::MinSize);
+
   if (isa<CXXConstructorDecl>(D) || isa<CXXDestructorDecl>(D))
     F->setUnnamedAddr(true);