Skip to content

Store function linkage in the ir #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/codegen/mod.rs
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ use ir::derive::{CanDeriveCopy, CanDeriveDebug, CanDeriveDefault,
CanDerivePartialEq, CanDeriveEq, CannotDeriveReason};
use ir::dot;
use ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
use ir::function::{Abi, Function, FunctionSig};
use ir::function::{Abi, Function, FunctionSig, Linkage};
use ir::int::IntKind;
use ir::item::{IsOpaque, Item, ItemCanonicalName, ItemCanonicalPath};
use ir::item_kind::ItemKind;
@@ -3127,6 +3127,13 @@ impl CodeGenerator for Function {
debug!("<Function as CodeGenerator>::codegen: item = {:?}", item);
debug_assert!(item.is_enabled_for_codegen(ctx));

// We can't currently do anything with Internal functions so just
// avoid generating anything for them.
match self.linkage() {
Linkage::Internal => return,
Linkage::External => {}
}

// Similar to static member variables in a class template, we can't
// generate bindings to template functions, because the set of
// instantiations is open ended and we have no way of knowing which
32 changes: 26 additions & 6 deletions src/ir/function.rs
Original file line number Diff line number Diff line change
@@ -49,6 +49,15 @@ impl FunctionKind {
}
}

/// The style of linkage
#[derive(Debug, Clone, Copy)]
pub enum Linkage {
/// Externally visible and can be linked against
External,
/// Not exposed externally. 'static inline' functions will have this kind of linkage
Internal
}

/// A function declaration, with a signature, arguments, and argument names.
///
/// The argument names vector must be the same length as the ones in the
@@ -69,6 +78,9 @@ pub struct Function {

/// The kind of function this is.
kind: FunctionKind,

/// The linkage of the function.
linkage: Linkage,
}

impl Function {
@@ -79,13 +91,15 @@ impl Function {
sig: TypeId,
comment: Option<String>,
kind: FunctionKind,
linkage: Linkage
) -> Self {
Function {
name: name,
mangled_name: mangled_name,
signature: sig,
comment: comment,
kind: kind,
linkage: linkage
}
}

@@ -108,6 +122,12 @@ impl Function {
pub fn kind(&self) -> FunctionKind {
self.kind
}

/// Get this function's linkage.
pub fn linkage(&self) -> Linkage {
self.linkage
}

}

impl DotAttributes for Function {
@@ -477,11 +497,11 @@ impl ClangSubItemParser for Function {
}

let linkage = cursor.linkage();
if linkage != CXLinkage_External &&
linkage != CXLinkage_UniqueExternal
{
return Err(ParseError::Continue);
}
let linkage = match linkage {
CXLinkage_External | CXLinkage_UniqueExternal => Linkage::External,
CXLinkage_Internal => Linkage::Internal,
_ => return Err(ParseError::Continue)
};

// Grab the signature using Item::from_ty.
let sig =
@@ -511,7 +531,7 @@ impl ClangSubItemParser for Function {

let comment = cursor.raw_comment();

let function = Self::new(name, mangled_name, sig, comment, kind);
let function = Self::new(name, mangled_name, sig, comment, kind, linkage);
Ok(ParseResult::New(function, Some(cursor)))
}
}