diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2015-05-06 11:46:36 -0700 |
---|---|---|
committer | Pirama Arumuga Nainar <pirama@google.com> | 2015-05-18 10:52:30 -0700 |
commit | 2c3e0051c31c3f5b2328b447eadf1cf9c4427442 (patch) | |
tree | c0104029af14e9f47c2ef58ca60e6137691f3c9b /docs/tutorial | |
parent | e1bc145815f4334641be19f1c45ecf85d25b6e5a (diff) | |
download | external_llvm-2c3e0051c31c3f5b2328b447eadf1cf9c4427442.zip external_llvm-2c3e0051c31c3f5b2328b447eadf1cf9c4427442.tar.gz external_llvm-2c3e0051c31c3f5b2328b447eadf1cf9c4427442.tar.bz2 |
Update aosp/master LLVM for rebase to r235153
Change-Id: I9bf53792f9fc30570e81a8d80d296c681d005ea7
(cherry picked from commit 0c7f116bb6950ef819323d855415b2f2b0aad987)
Diffstat (limited to 'docs/tutorial')
-rw-r--r-- | docs/tutorial/LangImpl5.rst | 4 | ||||
-rw-r--r-- | docs/tutorial/LangImpl7.rst | 2 | ||||
-rw-r--r-- | docs/tutorial/OCamlLangImpl5.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorial/LangImpl5.rst b/docs/tutorial/LangImpl5.rst index 72e34b1..ca2ffeb 100644 --- a/docs/tutorial/LangImpl5.rst +++ b/docs/tutorial/LangImpl5.rst @@ -254,7 +254,7 @@ In `Chapter 7 <LangImpl7.html>`_ of this tutorial ("mutable variables"), we'll talk about #1 in depth. For now, just believe me that you don't need SSA construction to handle this case. For #2, you have the choice of using the techniques that we will describe for #1, or you can insert -Phi nodes directly, if convenient. In this case, it is really really +Phi nodes directly, if convenient. In this case, it is really easy to generate the Phi node, so we choose to do it directly. Okay, enough of the motivation and overview, lets generate code! @@ -388,7 +388,7 @@ code: The first two lines here are now familiar: the first adds the "merge" block to the Function object (it was previously floating, like the else -block above). The second block changes the insertion point so that newly +block above). The second changes the insertion point so that newly created code will go into the "merge" block. Once that is done, we need to create the PHI node and set up the block/value pairs for the PHI. diff --git a/docs/tutorial/LangImpl7.rst b/docs/tutorial/LangImpl7.rst index c445908..6489407 100644 --- a/docs/tutorial/LangImpl7.rst +++ b/docs/tutorial/LangImpl7.rst @@ -632,7 +632,7 @@ own local variables, lets add this next! User-defined Local Variables ============================ -Adding var/in is just like any other other extensions we made to +Adding var/in is just like any other extension we made to Kaleidoscope: we extend the lexer, the parser, the AST and the code generator. The first step for adding our new 'var/in' construct is to extend the lexer. As before, this is pretty trivial, the code looks like diff --git a/docs/tutorial/OCamlLangImpl5.rst b/docs/tutorial/OCamlLangImpl5.rst index b8ae3c5..0faecfb 100644 --- a/docs/tutorial/OCamlLangImpl5.rst +++ b/docs/tutorial/OCamlLangImpl5.rst @@ -336,7 +336,7 @@ for the 'then' block. let phi = build_phi incoming "iftmp" builder in The first two lines here are now familiar: the first adds the "merge" -block to the Function object. The second block changes the insertion +block to the Function object. The second changes the insertion point so that newly created code will go into the "merge" block. Once that is done, we need to create the PHI node and set up the block/value pairs for the PHI. |