From 7cab813ad91ec7b2016ae3c0e6fc804becb2d623 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Fri, 20 Jul 2018 17:19:58 +0200
Subject: [PATCH 1/2] Only methods are fn-like, not other associated items
---
src/librustc/hir/map/blocks.rs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/librustc/hir/map/blocks.rs b/src/librustc/hir/map/blocks.rs
index 5a595d14db7aa..f2f7f95426ab8 100644
--- a/src/librustc/hir/map/blocks.rs
+++ b/src/librustc/hir/map/blocks.rs
@@ -51,6 +51,12 @@ impl MaybeFnLike for ast::Item {
}
}
+impl MaybeFnLike for ast::ImplItem {
+ fn is_fn_like(&self) -> bool {
+ match self.node { ast::ImplItemKind::Method(..) => true, _ => false, }
+ }
+}
+
impl MaybeFnLike for ast::TraitItem {
fn is_fn_like(&self) -> bool {
match self.node {
@@ -141,7 +147,7 @@ impl<'a> FnLikeNode<'a> {
let fn_like = match node {
map::NodeItem(item) => item.is_fn_like(),
map::NodeTraitItem(tm) => tm.is_fn_like(),
- map::NodeImplItem(_) => true,
+ map::NodeImplItem(it) => it.is_fn_like(),
map::NodeExpr(e) => e.is_fn_like(),
_ => false
};
From c7d39e0c510206b74453ca8636e647852e6f294c Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Fri, 20 Jul 2018 18:42:45 +0200
Subject: [PATCH 2/2] Remove unused method
---
src/librustc_codegen_llvm/builder.rs | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
index c71e49b0d8821..e4acb2ad4b161 100644
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/src/librustc_codegen_llvm/builder.rs
@@ -13,7 +13,7 @@
use llvm;
use llvm::{AtomicRmwBinOp, AtomicOrdering, SynchronizationScope, AsmDialect};
use llvm::{Opcode, IntPredicate, RealPredicate, False, OperandBundleDef};
-use llvm::{ValueRef, BasicBlockRef, BuilderRef, ModuleRef};
+use llvm::{ValueRef, BasicBlockRef, BuilderRef};
use common::*;
use type_::Type;
use value::Value;
@@ -1157,23 +1157,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
}
}
- pub fn trap(&self) {
- unsafe {
- let bb: BasicBlockRef = llvm::LLVMGetInsertBlock(self.llbuilder);
- let fn_: ValueRef = llvm::LLVMGetBasicBlockParent(bb);
- let m: ModuleRef = llvm::LLVMGetGlobalParent(fn_);
- let p = "llvm.trap\0".as_ptr();
- let t: ValueRef = llvm::LLVMGetNamedFunction(m, p as *const _);
- assert!((t as isize != 0));
- let args: &[ValueRef] = &[];
- self.count_insn("trap");
- llvm::LLVMRustBuildCall(self.llbuilder, t,
- args.as_ptr(), args.len() as c_uint,
- ptr::null_mut(),
- noname());
- }
- }
-
pub fn landing_pad(&self, ty: Type, pers_fn: ValueRef,
num_clauses: usize) -> ValueRef {
self.count_insn("landingpad");