Merge pull request #424 from jbrodman/master

Tracking Attribute API changes in ToT
This commit is contained in:
jbrodman
2013-01-22 07:45:20 -08:00

View File

@@ -315,7 +315,7 @@ Function::emitCode(FunctionEmitContext *ctx, llvm::Function *function,
#elif defined(LLVM_3_2) #elif defined(LLVM_3_2)
(function->getFnAttributes().hasAttribute(llvm::Attributes::AlwaysInline) == false) (function->getFnAttributes().hasAttribute(llvm::Attributes::AlwaysInline) == false)
#else // LLVM 3.3+ #else // LLVM 3.3+
(function->getAttributes().getFnAttributes().hasAttribute(llvm::Attribute::AlwaysInline) == false) (function->getAttributes().getFnAttributes().hasAttribute(llvm::AttributeSet::FunctionIndex, llvm::Attribute::AlwaysInline) == false)
#endif #endif
&& &&
costEstimate > CHECK_MASK_AT_FUNCTION_START_COST); costEstimate > CHECK_MASK_AT_FUNCTION_START_COST);