X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=docs%2FLangRef.rst;h=fe23ac0ce1d0ec0a279736fabef2584870f775dd;hp=68ac96f9b5a8579c47885ff9a7ffa2e6abdbd5ac;hb=5768bb8d77892926dff0d078b1fb08c14ea791f3;hpb=a550b51bac50493db75a7b5788a3f2c3b62fd913

diff --git a/docs/LangRef.rst b/docs/LangRef.rst
index 68ac96f9b5a..fe23ac0ce1d 100644
--- a/docs/LangRef.rst
+++ b/docs/LangRef.rst
@@ -879,6 +879,17 @@ example:
     This function attribute indicates that the function never returns
     with an unwind or exceptional control flow. If the function does
     unwind, its runtime behavior is undefined.
+``optnone``
+    This function attribute indicates that the function is not optimized
+    by any optimization or code generator passes with the 
+    exception of interprocedural optimization passes.
+    This attribute cannot be used together with the ``alwaysinline``
+    attribute; this attribute is also incompatible
+    with the ``minsize`` attribute and the ``optsize`` attribute.
+    
+    The inliner should never inline this function in any situation.
+    Only functions with the ``alwaysinline`` attribute are valid
+    candidates for inlining inside the body of this function.
 ``optsize``
     This attribute suggests that optimization passes and code generator
     passes make choices that keep the code size of this function low,