[llvm-branch-commits] [llvm-branch] r244614 - Merging r244554:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 11 10:40:14 2015
New Revision: 244614

URL: http://llvm.org/viewvc/llvm-project?rev=244614&view=rev
Log:
Merging r244554:
------------------------------------------------------------------------
r244554 | nicholas | 2015-08-10 18:05:16 -0700 (Mon, 10 Aug 2015) | 2 lines

Update the syntax for load instruction in this example.

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

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/docs/LangRef.rst

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 10:40:14 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243898,243927,243932,243934,243984,243986,244058,244123
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243898,243927,243932,243934,243984,243986,244058,244123,244554

Modified: llvm/branches/release_37/docs/LangRef.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/LangRef.rst?rev=244614&r1=244613&r2=244614&view=diff
==============================================================================
--- llvm/branches/release_37/docs/LangRef.rst (original)
+++ llvm/branches/release_37/docs/LangRef.rst Tue Aug 11 10:40:14 2015
@@ -6493,7 +6493,7 @@ Example:
 
       %ptr = alloca i32                               ; yields i32*:ptr
       store i32 3, i32* %ptr                          ; yields void
-      %val = load i32* %ptr                           ; yields i32:val = i32 3
+      %val = load i32, i32* %ptr                      ; yields i32:val = i32 3
 
 .. _i_fence: