[llvm-branch-commits] [llvm-branch] r258268 - Merging r258207:

[Quentin Colombet via llvm-branch-commits]

Author: qcolombet
Date: Tue Jan 19 19:09:12 2016
New Revision: 258268

URL: http://llvm.org/viewvc/llvm-project?rev=258268&view=rev
Log:
Merging r258207:
------------------------------------------------------------------------
r258207 | qcolombet | 2016-01-19 14:31:12 -0800 (Tue, 19 Jan 2016) | 1 line

[MachineFunction] Constify getter. NFC.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_38/   (props changed)
    llvm/branches/release_38/include/llvm/CodeGen/MachineFunction.h
    llvm/branches/release_38/lib/CodeGen/MachineFunction.cpp

Propchange: llvm/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 19:09:12 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,257645,257648,257730,257775,257791,257875,257902,257905,257925,257929-257930,257977,257979,257997,258168
+/llvm/trunk:155241,257645,257648,257730,257775,257791,257875,257902,257905,257925,257929-257930,257977,257979,257997,258168,258207

Modified: llvm/branches/release_38/include/llvm/CodeGen/MachineFunction.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/include/llvm/CodeGen/MachineFunction.h?rev=258268&r1=258267&r2=258268&view=diff
==============================================================================
--- llvm/branches/release_38/include/llvm/CodeGen/MachineFunction.h (original)
+++ llvm/branches/release_38/include/llvm/CodeGen/MachineFunction.h Tue Jan 19 19:09:12 2016
@@ -295,7 +295,7 @@ public:
   }
 
   /// Should we be emitting segmented stack stuff for the function
-  bool shouldSplitStack();
+  bool shouldSplitStack() const;
 
   /// getNumBlockIDs - Return the number of MBB ID's allocated.
   ///

Modified: llvm/branches/release_38/lib/CodeGen/MachineFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/CodeGen/MachineFunction.cpp?rev=258268&r1=258267&r2=258268&view=diff
==============================================================================
--- llvm/branches/release_38/lib/CodeGen/MachineFunction.cpp (original)
+++ llvm/branches/release_38/lib/CodeGen/MachineFunction.cpp Tue Jan 19 19:09:12 2016
@@ -163,7 +163,7 @@ getOrCreateJumpTableInfo(unsigned EntryK
 }
 
 /// Should we be emitting segmented stack stuff for the function
-bool MachineFunction::shouldSplitStack() {
+bool MachineFunction::shouldSplitStack() const {
   return getFunction()->hasFnAttribute("split-stack");
 }