[llvm-branch-commits] [cfe-branch] r323117 - Merging r322904 and r322905:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Jan 22 06:15:37 2018
New Revision: 323117

URL: http://llvm.org/viewvc/llvm-project?rev=323117&view=rev
Log:
Merging r322904 and r322905:

------------------------------------------------------------------------
r322904 | rnk | 2018-01-18 23:55:14 +0100 (Thu, 18 Jan 2018) | 3 lines

[CodeView] Sink complex inline functions to .cpp file, NFC

I'm cleaning up this code before I attempt to fix a line table bug.
------------------------------------------------------------------------

------------------------------------------------------------------------
r322905 | rnk | 2018-01-18 23:55:43 +0100 (Thu, 18 Jan 2018) | 5 lines

[CodeView] Add line numbers for inlined call sites

We did this for inline call site line tables, but we hadn't done it for
regular function line tables yet. This patch copies that logic from
encodeInlineLineTable.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_60/   (props changed)

Propchange: cfe/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 22 06:15:37 2018
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:321754,321771,321777,321779,321933,322018,322236,322246,322350,322390,322405,322420,322518,322593,322813,322901,322984
+/cfe/trunk:321754,321771,321777,321779,321933,322018,322236,322246,322350,322390,322405,322420,322518,322593,322813,322901,322904,322984
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920