Merge branch 'master' into master

linuxzjs · Jan 5, 2017 · 437ab7f · 437ab7f
2 parents fc673a9 + 53da672
commit 437ab7f
Show file tree

Hide file tree

Showing 6 changed files with 716 additions and 463 deletions.
diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
@@ -345,7 +345,8 @@ int BPFModule::load_includes(const string &text) {
 
 int BPFModule::annotate() {
  for (auto fn = mod_->getFunctionList().begin(); fn != mod_->getFunctionList().end(); ++fn)
- fn->addFnAttr(Attribute::AlwaysInline);
+ if (!fn->hasFnAttribute(Attribute::NoInline))
+ fn->addFnAttr(Attribute::AlwaysInline);
 
  // separate module to hold the reader functions
  auto m = make_unique<Module>("sscanf", *ctx_);